# HG changeset patch # User Alex Kotchnev # Date 1244096478 14400 # Node ID 239559736173897a149554f96b341fc627432cdc # Parent 3170caef9ce7ed1afe1f6bf3bfa476549bcff822 attempted to add a debug option to run grails command diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsActionProvider.java b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsActionProvider.java --- a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsActionProvider.java +++ b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/GrailsActionProvider.java @@ -42,6 +42,8 @@ import java.net.URL; import java.util.concurrent.Callable; import java.util.logging.Logger; +import org.netbeans.api.debugger.DebuggerInfo; +import org.netbeans.api.debugger.DebuggerManager; import org.netbeans.api.project.ProjectInformation; import org.netbeans.api.extexecution.ExecutionDescriptor; import org.netbeans.api.extexecution.ExecutionService; @@ -113,19 +115,19 @@ LifecycleManager.getDefault().saveAll(); executeRunAction(true); } else if (COMMAND_GRAILS_SHELL.equals(command)) { - executeSimpleAction("shell"); // NOI18N + executeSimpleAction("shell", false); // NOI18N } else if (COMMAND_TEST.equals(command)) { - executeSimpleAction("test-app"); // NOI18N + executeSimpleAction("test-app", false); // NOI18N } else if (COMMAND_CLEAN.equals(command)) { - executeSimpleAction("clean"); // NOI18N + executeSimpleAction("clean", false); // NOI18N } else if (COMMAND_COMPILE.equals(command)) { - executeSimpleAction("compile"); // NOI18N + executeSimpleAction("compile", false); // NOI18N } else if (COMMAND_UPGRADE.equals(command)) { - executeSimpleAction("upgrade"); // NOI18N + executeSimpleAction("upgrade", false); // NOI18N } else if (COMMAND_DELETE.equals(command)) { DefaultProjectOperations.performDefaultDeleteOperation(project); } else if (COMMAND_BUILD.equals(command)) { - executeSimpleAction("war"); // NOI18N + executeSimpleAction("war", false); // NOI18N } } @@ -137,6 +139,10 @@ executeRunAction(false); } + private void executeDebugAction() { + executeRunAction(true); + } + private void executeRunAction(final boolean debug) { final GrailsServerState serverState = project.getLookup().lookup(GrailsServerState.class); if (serverState != null && serverState.isRunning()) { @@ -163,18 +169,28 @@ ProjectInformation inf = project.getLookup().lookup(ProjectInformation.class); String displayName = inf.getDisplayName() + " (run-app)"; // NOI18N - ExecutionDescriptor descriptor = project.getCommandSupport().getRunDescriptor(); + ExecutionDescriptor descriptor = null; + if (debug) { + descriptor = project.getCommandSupport().getDebugDescriptor(); + } else { + descriptor = project.getCommandSupport().getRunDescriptor(); + } ExecutionService service = ExecutionService.newService(callable, descriptor, displayName); service.run(); + if (debug) { +// JPDADebugger jpdad; + DebuggerInfo debuggerInfo = DebuggerInfo.create("grails", null); + DebuggerManager.getDebuggerManager().startDebugging(debuggerInfo); + } } - private void executeSimpleAction(String command) { + private void executeSimpleAction(String command, boolean debug) { ProjectInformation inf = project.getLookup().lookup(ProjectInformation.class); String displayName = inf.getDisplayName() + " (" + command + ")"; // NOI18N Callable callable = ExecutionSupport.getInstance().createSimpleCommand( - command, GrailsProjectConfig.forProject(project)); + command, false, GrailsProjectConfig.forProject(project)); ExecutionDescriptor descriptor = project.getCommandSupport().getDescriptor(command); diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GenerateAction.java b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GenerateAction.java --- a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GenerateAction.java +++ b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GenerateAction.java @@ -97,7 +97,7 @@ String displayName = inf.getDisplayName() + " (" + command + ")"; // NOI18N Callable callable = ExecutionSupport.getInstance().createSimpleCommand( - command, GrailsProjectConfig.forProject(prj), builder.toString()); // NOI18N + command, false, GrailsProjectConfig.forProject(prj), builder.toString()); // NOI18N ExecutionDescriptor descriptor = prj.getCommandSupport().getDescriptor(command); diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GrailsCommandAction.java b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GrailsCommandAction.java --- a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GrailsCommandAction.java +++ b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/actions/GrailsCommandAction.java @@ -123,7 +123,7 @@ descriptor = project.getCommandSupport().getRunDescriptor(); } else { callable = ExecutionSupport.getInstance().createSimpleCommand( - commandDescriptor.getGrailsCommand().getCommand(), GrailsProjectConfig.forProject(project), params); + commandDescriptor.getGrailsCommand().getCommand(), false, GrailsProjectConfig.forProject(project), params); descriptor = project.getCommandSupport().getDescriptor(commandDescriptor.getGrailsCommand().getCommand()); } ExecutionService service = ExecutionService.newService(callable, descriptor, displayName); diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.form b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.form --- a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.form +++ b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.form @@ -1,15 +1,6 @@
- - - - - - - - - @@ -40,7 +31,11 @@ - + + + + + @@ -60,9 +55,12 @@ - - - + + + + + + @@ -79,6 +77,13 @@ + + + + + + + diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.java b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.java --- a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.java +++ b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.java @@ -402,8 +402,8 @@ // //GEN-BEGIN:initComponents private void initComponents() { + rakeTaskLabel = new javax.swing.JLabel(); debugCheckbox = new javax.swing.JCheckBox(); - rakeTaskLabel = new javax.swing.JLabel(); taskParamLabel = new javax.swing.JLabel(); matchingTaskLabel = new javax.swing.JLabel(); matchingTaskSP = new javax.swing.JScrollPane(); @@ -413,17 +413,17 @@ rakeTaskHint = new javax.swing.JLabel(); taskParametersComboBox = new javax.swing.JComboBox(); - org.openide.awt.Mnemonics.setLocalizedText(debugCheckbox, org.openide.util.NbBundle.getMessage(GrailsCommandChooser.class, "GrailsCommandChooser.debugCheckbox.text")); // NOI18N - rakeTaskLabel.setLabelFor(rakeTaskField); org.openide.awt.Mnemonics.setLocalizedText(rakeTaskLabel, org.openide.util.NbBundle.getMessage(GrailsCommandChooser.class, "GrailsCommandChooser.rakeTaskLabel.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(debugCheckbox, org.openide.util.NbBundle.getMessage(GrailsCommandChooser.class, "GrailsCommandChooser.debugCheckbox.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(taskParamLabel, org.openide.util.NbBundle.getMessage(GrailsCommandChooser.class, "GrailsCommandChooser.taskParamLabel.text")); // NOI18N matchingTaskLabel.setLabelFor(matchingTaskList); org.openide.awt.Mnemonics.setLocalizedText(matchingTaskLabel, org.openide.util.NbBundle.getMessage(GrailsCommandChooser.class, "GrailsCommandChooser.matchingTaskLabel.text")); // NOI18N - matchingTaskList.setFont(new java.awt.Font("Monospaced", 0, 12)); + matchingTaskList.setFont(new java.awt.Font("Monospaced", 0, 12)); // NOI18N matchingTaskList.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION); matchingTaskList.addMouseListener(new java.awt.event.MouseAdapter() { public void mouseClicked(java.awt.event.MouseEvent evt) { @@ -464,7 +464,10 @@ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(taskParametersComboBox, 0, 575, Short.MAX_VALUE) .add(rakeTaskFieldPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 575, Short.MAX_VALUE))) - .add(org.jdesktop.layout.GroupLayout.LEADING, matchingTaskLabel)) + .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup() + .add(matchingTaskLabel) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(debugCheckbox))) .addContainerGap()) ); layout.setVerticalGroup( @@ -479,9 +482,11 @@ .add(taskParamLabel) .add(taskParametersComboBox, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 21, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED) - .add(matchingTaskLabel) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(matchingTaskSP, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 373, Short.MAX_VALUE) + .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) + .add(matchingTaskLabel) + .add(debugCheckbox, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 33, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED) + .add(matchingTaskSP, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 357, Short.MAX_VALUE) .addContainerGap()) ); }// //GEN-END:initComponents diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandSupport.java b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandSupport.java --- a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandSupport.java +++ b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandSupport.java @@ -125,6 +125,10 @@ return getDescriptor(GrailsPlatform.IDE_RUN_COMMAND); } + public ExecutionDescriptor getDebugDescriptor() { + return getDescriptor(GrailsPlatform.IDE_RUN_COMMAND,null,true); + } + public ExecutionDescriptor getDescriptor(String command) { return getDescriptor(command, null, false); } @@ -181,7 +185,7 @@ } public void refreshGrailsCommands() { - Callable callable = ExecutionSupport.getInstance().createSimpleCommand("help", // NOI18N + Callable callable = ExecutionSupport.getInstance().createSimpleCommand("help", false, // NOI18N GrailsProjectConfig.forProject(project)); final HelpLineProcessor lineProcessor = new HelpLineProcessor(); diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/plugins/GrailsPluginSupport.java b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/plugins/GrailsPluginSupport.java --- a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/plugins/GrailsPluginSupport.java +++ b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/plugins/GrailsPluginSupport.java @@ -110,7 +110,7 @@ final String displayName = inf.getDisplayName() + " (" + command + ")"; // NOI18N final Callable callable = ExecutionSupport.getInstance().createSimpleCommand( - command, GrailsProjectConfig.forProject(project)); + command, false, GrailsProjectConfig.forProject(project)); final PluginProcessor processor = new PluginProcessor(); ExecutionDescriptor descriptor = new ExecutionDescriptor().frontWindow(true); @@ -316,7 +316,7 @@ } Callable callable = ExecutionSupport.getInstance().createSimpleCommand( - command, GrailsProjectConfig.forProject(project), args.toArray(new String[args.size()])); + command, false, GrailsProjectConfig.forProject(project), args.toArray(new String[args.size()])); ExecutionDescriptor descriptor = new ExecutionDescriptor().frontWindow(true) .postExecution(new RefreshProjectRunnable(project)); diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/templates/NewGrailsArtifactWizardIterator.java b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/templates/NewGrailsArtifactWizardIterator.java --- a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/templates/NewGrailsArtifactWizardIterator.java +++ b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/templates/NewGrailsArtifactWizardIterator.java @@ -181,7 +181,7 @@ String displayName = inf.getDisplayName() + " (" + serverCommand + ")"; // NOI18N final Callable grailsCallable = ExecutionSupport.getInstance().createSimpleCommand( - serverCommand, GrailsProjectConfig.forProject(project), artifactName); + serverCommand, false, GrailsProjectConfig.forProject(project), artifactName); final DialogLineProcessor dialogProcessor = new DialogLineProcessor(); // This is bit hacky, we prepared line processor listening for overwrite # HG changeset patch # User Alex Kotchnev # Date 1244096546 14400 # Node ID 6934481df4a5de52afd4e12405252a046f728c33 # Parent 239559736173897a149554f96b341fc627432cdc attempted to add a debug option to run grails command diff --git a/groovy.grails/manifest.mf b/groovy.grails/manifest.mf --- a/groovy.grails/manifest.mf +++ b/groovy.grails/manifest.mf @@ -1,7 +1,7 @@ Manifest-Version: 1.0 AutoUpdate-Show-In-Client: false OpenIDE-Module: org.netbeans.modules.groovy.grails +OpenIDE-Module-Implementation-Version: 1 OpenIDE-Module-Layer: org/netbeans/modules/groovy/grails/resources/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/grails/resources/Bundle.properties -OpenIDE-Module-Specification-Version: 1.16 diff --git a/groovy.grails/nbproject/project.properties b/groovy.grails/nbproject/project.properties --- a/groovy.grails/nbproject/project.properties +++ b/groovy.grails/nbproject/project.properties @@ -2,3 +2,4 @@ javac.source=1.5 nbm.homepage=http://wiki.netbeans.org/groovy nbm.module.author=Martin Adamek, Petr Hejl, Matthias Schmidt +spec.version.base=1.16 diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/RuntimeHelper.java b/groovy.grails/src/org/netbeans/modules/groovy/grails/RuntimeHelper.java --- a/groovy.grails/src/org/netbeans/modules/groovy/grails/RuntimeHelper.java +++ b/groovy.grails/src/org/netbeans/modules/groovy/grails/RuntimeHelper.java @@ -59,14 +59,24 @@ public static final String WIN_EXECUTABLE_FILE = "grails.bat"; // NOI18N + public static final String WIN_DEBUG_EXECUTABLE_FILE = "grails-debug.bat"; // NOI18N + public static final String WIN_EXECUTABLE = "\\bin\\" + WIN_EXECUTABLE_FILE; // NOI18N + public static final String WIN_DEBUG_EXECUTABLE = "\\bin\\" + WIN_DEBUG_EXECUTABLE_FILE; // NOI18N + public static final String NIX_EXECUTABLE_FILE = "grails"; // NOI18N + public static final String NIX_DEBUG_EXECUTABLE_FILE = "grails-debug"; // NOI18N + public static final String NIX_EXECUTABLE = "/bin/" + NIX_EXECUTABLE_FILE; // NOI18N + public static final String NIX_DEBUG_EXECUTABLE = "/bin/" + NIX_DEBUG_EXECUTABLE_FILE; // NOI18N + public static final String DEB_EXECUTABLE = "/usr/bin/" + NIX_EXECUTABLE_FILE; // NOI18N + public static final String DEB_DEBUG_EXECUTABLE = "/usr/bin/" + NIX_DEBUG_EXECUTABLE_FILE; // NOI18N + public static final String DEB_START_FILE = "/bin/startGrails"; // NOI18N public static final String DEB_LOCATION = "/usr/share/grails"; // NOI18N diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/api/ExecutionSupport.java b/groovy.grails/src/org/netbeans/modules/groovy/grails/api/ExecutionSupport.java --- a/groovy.grails/src/org/netbeans/modules/groovy/grails/api/ExecutionSupport.java +++ b/groovy.grails/src/org/netbeans/modules/groovy/grails/api/ExecutionSupport.java @@ -96,7 +96,7 @@ } GrailsPlatform.CommandDescriptor descriptor = GrailsPlatform.CommandDescriptor.forProject( - "create-app", work, null, args, null); // NOI18N + "create-app", false, work, null, args, null); // NOI18N return platform.createCommand(descriptor).call(); } @@ -110,14 +110,14 @@ File directory = FileUtil.toFile(config.getProject().getProjectDirectory()); GrailsPlatform.CommandDescriptor descriptor = GrailsPlatform.CommandDescriptor.forProject( - GrailsPlatform.IDE_RUN_COMMAND, directory, config, arguments, null); + GrailsPlatform.IDE_RUN_COMMAND, false, directory, config, arguments, null); return platform.createCommand(descriptor).call(); } }; } - public Callable createSimpleCommand(final String command, final GrailsProjectConfig config, + public Callable createSimpleCommand(final String command, boolean debug, final GrailsProjectConfig config, final String... arguments) { return new Callable() { @@ -125,7 +125,7 @@ public Process call() throws Exception { File directory = FileUtil.toFile(config.getProject().getProjectDirectory()); GrailsPlatform.CommandDescriptor descriptor = GrailsPlatform.CommandDescriptor.forProject( - command, directory, config, arguments, null); + command, false, directory, config, arguments, null); return platform.createCommand(descriptor).call(); } }; diff --git a/groovy.grails/src/org/netbeans/modules/groovy/grails/api/GrailsPlatform.java b/groovy.grails/src/org/netbeans/modules/groovy/grails/api/GrailsPlatform.java --- a/groovy.grails/src/org/netbeans/modules/groovy/grails/api/GrailsPlatform.java +++ b/groovy.grails/src/org/netbeans/modules/groovy/grails/api/GrailsPlatform.java @@ -36,7 +36,6 @@ * * Portions Copyrighted 2008 Sun Microsystems, Inc. */ - package org.netbeans.modules.groovy.grails.api; import java.beans.PropertyChangeEvent; @@ -93,721 +92,707 @@ // TODO more appropriate would be getDefault and forProject public final class GrailsPlatform { - public static final String IDE_RUN_COMMAND = "run-app"; // NOI18N + public static final String IDE_RUN_COMMAND = "run-app"; // NOI18N + private static final Logger LOGGER = Logger.getLogger(GrailsPlatform.class.getName()); + private static final AtomicLong UNIQUE_MARK = new AtomicLong(); + private static final ClassPath EMPTY_CLASSPATH = ClassPathSupport.createClassPath(new URL[]{}); + private static final Set GUARDED_COMMANDS = new HashSet(); - private static final Logger LOGGER = Logger.getLogger(GrailsPlatform.class.getName()); + static { + Collections.addAll(GUARDED_COMMANDS, "run-app", "run-app-https", "run-war", "shell"); //NOI18N + } + private final ChangeSupport changeSupport = new ChangeSupport(this); + private static GrailsPlatform instance; + private Version version; + private ClassPath classpath; - private static final AtomicLong UNIQUE_MARK = new AtomicLong(); + private GrailsPlatform() { + super(); + } - private static final ClassPath EMPTY_CLASSPATH = ClassPathSupport.createClassPath(new URL[] {}); + /** + * Return the instance representing the IDE configured Grails runtime. + * + * @return the instance representing the IDE configured Grails runtime + */ + public static synchronized GrailsPlatform getDefault() { + if (instance == null) { + instance = new GrailsPlatform(); + GrailsSettings.getInstance().addPropertyChangeListener(new PropertyChangeListener() { - private static final Set GUARDED_COMMANDS = new HashSet(); + public void propertyChange(PropertyChangeEvent evt) { + if (GrailsSettings.GRAILS_BASE_PROPERTY.equals(evt.getPropertyName())) { + instance.reload(); + GrailsInstanceProvider.getInstance().runtimeChanged(); + } + } + }); + instance.reload(); + } + return instance; + } - static { - Collections.addAll(GUARDED_COMMANDS, "run-app", "run-app-https", "run-war", "shell"); //NOI18N - } + /** + * Creates the callable spawning the command (process) described + * by the command descriptor. Usually you don't need to use this method + * directly as most of use cases can be solved with {@link ExecutionSupport}. + * + * @param descriptor descriptor of the command and its environment + * @return the callable spawning the command (process) + * @throws IllegalStateException if the runtime is not configured + * + * @see #isConfigured() + * @see ExecutionSupport + */ + public Callable createCommand(CommandDescriptor descriptor) { + Parameters.notNull("descriptor", descriptor); - private final ChangeSupport changeSupport = new ChangeSupport(this); + if (!isConfigured()) { + throw new IllegalStateException("Grails not configured"); // NOI18N + } + return new GrailsCallable(descriptor); + } - private static GrailsPlatform instance; + /** + * Returns true if the runtime is configured (usable). + * + * @return true if the runtime is configured (usable) + */ + public boolean isConfigured() { + String grailsBase = GrailsSettings.getInstance().getGrailsBase(); + if (grailsBase == null) { + return false; + } - private Version version; + return RuntimeHelper.isValidRuntime(new File(grailsBase)); + } - private ClassPath classpath; + public ClassPath getClassPath() { + synchronized (this) { + if (classpath != null) { + return classpath; + } - private GrailsPlatform() { - super(); - } + if (!isConfigured()) { + classpath = EMPTY_CLASSPATH; + return classpath; + } - /** - * Return the instance representing the IDE configured Grails runtime. - * - * @return the instance representing the IDE configured Grails runtime - */ - public static synchronized GrailsPlatform getDefault() { - if (instance == null) { - instance = new GrailsPlatform(); - GrailsSettings.getInstance().addPropertyChangeListener(new PropertyChangeListener() { + File grailsHome = getGrailsHome(); + if (!grailsHome.exists()) { + classpath = EMPTY_CLASSPATH; + return classpath; + } - public void propertyChange(PropertyChangeEvent evt) { - if (GrailsSettings.GRAILS_BASE_PROPERTY.equals(evt.getPropertyName())) { - instance.reload(); - GrailsInstanceProvider.getInstance().runtimeChanged(); - } - } - }); - instance.reload(); - } - return instance; - } + List jars = new ArrayList(); - /** - * Creates the callable spawning the command (process) described - * by the command descriptor. Usually you don't need to use this method - * directly as most of use cases can be solved with {@link ExecutionSupport}. - * - * @param descriptor descriptor of the command and its environment - * @return the callable spawning the command (process) - * @throws IllegalStateException if the runtime is not configured - * - * @see #isConfigured() - * @see ExecutionSupport - */ - public Callable createCommand(CommandDescriptor descriptor) { - Parameters.notNull("descriptor", descriptor); + File distDir = new File(grailsHome, "dist"); // NOI18N + File[] files = distDir.listFiles(); + if (files != null) { + jars.addAll(Arrays.asList(files)); + } - if (!isConfigured()) { - throw new IllegalStateException("Grails not configured"); // NOI18N - } - return new GrailsCallable(descriptor); - } + File libDir = new File(grailsHome, "lib"); // NOI18N + files = libDir.listFiles(); + if (files != null) { + jars.addAll(Arrays.asList(files)); + } - /** - * Returns true if the runtime is configured (usable). - * - * @return true if the runtime is configured (usable) - */ - public boolean isConfigured() { - String grailsBase = GrailsSettings.getInstance().getGrailsBase(); - if (grailsBase == null) { - return false; - } + List urls = new ArrayList(jars.size()); - return RuntimeHelper.isValidRuntime(new File(grailsBase)); - } + for (File f : jars) { + try { + if (f.isFile()) { + URL entry = f.toURI().toURL(); + if (FileUtil.isArchiveFile(entry)) { + entry = FileUtil.getArchiveRoot(entry); + urls.add(entry); + } + } + } catch (MalformedURLException mue) { + assert false : mue; + } + } - public ClassPath getClassPath() { - synchronized (this) { - if (classpath != null) { - return classpath; - } + classpath = ClassPathSupport.createClassPath(urls.toArray(new URL[urls.size()])); + return classpath; + } + } - if (!isConfigured()) { - classpath = EMPTY_CLASSPATH; - return classpath; - } + // TODO not public API unless it is really needed + public Version getVersion() { + synchronized (this) { + if (version != null) { + return version; + } - File grailsHome = getGrailsHome(); - if (!grailsHome.exists()) { - classpath = EMPTY_CLASSPATH; - return classpath; - } + String grailsBase = GrailsSettings.getInstance().getGrailsBase(); + try { + if (grailsBase != null) { + String stringVersion = RuntimeHelper.getRuntimeVersion(new File(grailsBase)); + if (stringVersion != null) { + version = Version.valueOf(stringVersion); + } else { + version = Version.VERSION_DEFAULT; + } + } else { + version = Version.VERSION_DEFAULT; + } + } catch (IllegalArgumentException ex) { + version = Version.VERSION_DEFAULT; + } - List jars = new ArrayList(); + return version; + } + } - File distDir = new File(grailsHome, "dist"); // NOI18N - File[] files = distDir.listFiles(); - if (files != null) { - jars.addAll(Arrays.asList(files)); - } + public void addChangeListener(ChangeListener listener) { + changeSupport.addChangeListener(listener); + } - File libDir = new File(grailsHome, "lib"); // NOI18N - files = libDir.listFiles(); - if (files != null) { - jars.addAll(Arrays.asList(files)); - } + public void removeChangeListener(ChangeListener listener) { + changeSupport.removeChangeListener(listener); + } - List urls = new ArrayList(jars.size()); + /** + * Reloads the runtime instance variables. + */ + private void reload() { + synchronized (this) { + version = null; + classpath = null; + } - for (File f : jars) { - try { - if (f.isFile()) { - URL entry = f.toURI().toURL(); - if (FileUtil.isArchiveFile(entry)) { - entry = FileUtil.getArchiveRoot(entry); - urls.add(entry); - } - } - } catch (MalformedURLException mue) { - assert false : mue; - } - } + changeSupport.fireChange(); - classpath = ClassPathSupport.createClassPath(urls.toArray(new URL[urls.size()])); - return classpath; - } - } + // figure out the version on background + // default executor as general purpose should be enough for this + RequestProcessor.getDefault().post(new Runnable() { - // TODO not public API unless it is really needed - public Version getVersion() { - synchronized (this) { - if (version != null) { - return version; - } + public void run() { + synchronized (GrailsPlatform.this) { + if (version != null) { + return; + } - String grailsBase = GrailsSettings.getInstance().getGrailsBase(); - try { - if (grailsBase != null) { - String stringVersion = RuntimeHelper.getRuntimeVersion(new File(grailsBase)); - if (stringVersion != null) { - version = Version.valueOf(stringVersion); - } else { - version = Version.VERSION_DEFAULT; - } - } else { - version = Version.VERSION_DEFAULT; - } - } catch (IllegalArgumentException ex) { - version = Version.VERSION_DEFAULT; - } + String grailsBase = GrailsSettings.getInstance().getGrailsBase(); + try { + if (grailsBase != null) { + String stringVersion = RuntimeHelper.getRuntimeVersion(new File(grailsBase)); + if (stringVersion != null) { + version = Version.valueOf(stringVersion); + } else { + version = Version.VERSION_DEFAULT; + } + } else { + version = Version.VERSION_DEFAULT; + } + } catch (IllegalArgumentException ex) { + version = Version.VERSION_DEFAULT; + } + } + } + }); + } - return version; - } - } + /** + * Returns the grails home of the configured runtime. + * + * @return the grails home + * @throws IllegalStateException if the runtime is not configured + */ + public File getGrailsHome() { + String grailsBase = GrailsSettings.getInstance().getGrailsBase(); + if (grailsBase == null || !RuntimeHelper.isValidRuntime(new File(grailsBase))) { + throw new IllegalStateException("Grails not configured"); // NOI18N + } - public void addChangeListener(ChangeListener listener) { - changeSupport.addChangeListener(listener); - } + return new File(grailsBase); + } - public void removeChangeListener(ChangeListener listener) { - changeSupport.removeChangeListener(listener); - } + private static String createJvmArguments(Properties properties) { + StringBuilder builder = new StringBuilder(); + int i = 0; - /** - * Reloads the runtime instance variables. - */ - private void reload() { - synchronized (this) { - version = null; - classpath = null; - } + for (Enumeration e = properties.propertyNames(); e.hasMoreElements();) { + String key = e.nextElement().toString(); + String value = properties.getProperty(key); + if (value != null) { + if (i > 0) { + builder.append(" "); // NOI18N + } + builder.append("-D").append(key); // NOI18N + builder.append("="); // NOI18N + builder.append(value); + i++; + } + } + return builder.toString(); + } - changeSupport.fireChange(); - - // figure out the version on background - // default executor as general purpose should be enough for this - RequestProcessor.getDefault().post(new Runnable() { + private static String createCommandArguments(String[] arguments) { + StringBuilder builder = new StringBuilder(); + for (int i = 0; i < arguments.length; i++) { + if (i > 0) { + builder.append(" "); // NOI18N + } + builder.append(arguments[i]); + } + return builder.toString(); + } - public void run() { - synchronized (GrailsPlatform.this) { - if (version != null) { - return; - } + private static void checkForServer(CommandDescriptor descriptor, Process process) { + if (IDE_RUN_COMMAND.equals(descriptor.getName())) { // NOI18N + Project project = FileOwnerQuery.getOwner( + FileUtil.toFileObject(descriptor.getDirectory())); + if (project != null) { + GrailsInstanceProvider.getInstance().serverStarted(project, process); + } + } + } - String grailsBase = GrailsSettings.getInstance().getGrailsBase(); - try { - if (grailsBase != null) { - String stringVersion = RuntimeHelper.getRuntimeVersion(new File(grailsBase)); - if (stringVersion != null) { - version = Version.valueOf(stringVersion); - } else { - version = Version.VERSION_DEFAULT; - } - } else { - version = Version.VERSION_DEFAULT; - } - } catch (IllegalArgumentException ex) { - version = Version.VERSION_DEFAULT; - } - } - } - }); - } + /** + * Class describing the command to invoke and its environment. + * + * This class is Immutable. + */ + public static final class CommandDescriptor { - /** - * Returns the grails home of the configured runtime. - * - * @return the grails home - * @throws IllegalStateException if the runtime is not configured - */ - public File getGrailsHome() { - String grailsBase = GrailsSettings.getInstance().getGrailsBase(); - if (grailsBase == null || !RuntimeHelper.isValidRuntime(new File(grailsBase))) { - throw new IllegalStateException("Grails not configured"); // NOI18N - } + private final String name; + private final boolean debug; + private final File directory; + private final GrailsProjectConfig config; + private final String[] arguments; + private final Properties props; - return new File(grailsBase); - } + public static CommandDescriptor forProject(String name, boolean debug, File directory, + GrailsProjectConfig config, String[] arguments, Properties props) { - private static String createJvmArguments(Properties properties) { - StringBuilder builder = new StringBuilder(); - int i = 0; + return new CommandDescriptor(name, directory, config, arguments, props, false); + } - for (Enumeration e = properties.propertyNames(); e.hasMoreElements();) { - String key = e.nextElement().toString(); - String value = properties.getProperty(key); - if (value != null) { - if (i > 0) { - builder.append(" "); // NOI18N - } - builder.append("-D").append(key); // NOI18N - builder.append("="); // NOI18N - builder.append(value); - i++; - } - } - return builder.toString(); - } + /** + * Creates the full customizable command descriptor. + * + * @param name command name + * @param directory working directory + * @param env grails environment + * @param arguments command arguments + * @param props environment properties + */ + private CommandDescriptor(String name, File directory, GrailsProjectConfig config, + String[] arguments, Properties props, boolean debug) { + this.name = name; + this.debug = debug; + this.directory = directory; + this.config = config; + this.arguments = arguments.clone(); + this.props = props != null ? new Properties(props) : new Properties(); + } - private static String createCommandArguments(String[] arguments) { - StringBuilder builder = new StringBuilder(); - for (int i = 0; i < arguments.length; i++) { - if (i > 0) { - builder.append(" "); // NOI18N - } - builder.append(arguments[i]); - } - return builder.toString(); - } + /** + * Returns the command name. + * + * @return the command name + */ + public String getName() { + return name; + } - private static void checkForServer(CommandDescriptor descriptor, Process process) { - if (IDE_RUN_COMMAND.equals(descriptor.getName())) { // NOI18N - Project project = FileOwnerQuery.getOwner( - FileUtil.toFileObject(descriptor.getDirectory())); - if (project != null) { - GrailsInstanceProvider.getInstance().serverStarted(project, process); - } - } - } + /** + * Returns the working directory. + * + * @return the working directory + */ + public File getDirectory() { + return directory; + } - /** - * Class describing the command to invoke and its environment. - * - * This class is Immutable. - */ - public static final class CommandDescriptor { + public GrailsProjectConfig getProjectConfig() { + return config; + } - private final String name; + /** + * Returns the command arguments. + * + * @return the command arguments + */ + public String[] getArguments() { + return arguments.clone(); + } - private final File directory; + /** + * Returns the environment properties. + * + * @return the environment properties + */ + public Properties getProps() { + return new Properties(props); + } - private final GrailsProjectConfig config; + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final CommandDescriptor other = (CommandDescriptor) obj; + if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) { + return false; + } + return true; + } - private final String[] arguments; + @Override + public int hashCode() { + int hash = 7; + hash = 41 * hash + (this.name != null ? this.name.hashCode() : 0); + return hash; + } + } - private final Properties props; + public static final class Version implements Comparable { - public static CommandDescriptor forProject(String name, File directory, - GrailsProjectConfig config, String[] arguments, Properties props) { + public static final Version VERSION_DEFAULT = new Version(1, null, null, null, null); + public static final Version VERSION_1_1 = new Version(1, 1, null, null, null); + private final int major; + private final Integer minor; + private final Integer micro; + private final Integer update; + private final String qualifier; + private String asString; - return new CommandDescriptor(name, directory, config, arguments, props); - } + protected Version(int major, Integer minor, Integer micro, Integer update, String qualifier) { + this.major = major; + this.minor = minor; + this.micro = micro; + this.update = update; + this.qualifier = qualifier; + } - /** - * Creates the full customizable command descriptor. - * - * @param name command name - * @param directory working directory - * @param env grails environment - * @param arguments command arguments - * @param props environment properties - */ - private CommandDescriptor(String name, File directory, GrailsProjectConfig config, - String[] arguments, Properties props) { - this.name = name; - this.directory = directory; - this.config = config; - this.arguments = arguments.clone(); - this.props = props != null ? new Properties(props) : new Properties(); - } + public static Version valueOf(String version) { + String[] stringParts = version.split("-"); // NOI18N - /** - * Returns the command name. - * - * @return the command name - */ - public String getName() { - return name; - } + String qualifier = null; + if (stringParts.length > 2) { + throw new IllegalArgumentException(version); + } + if (stringParts.length == 2) { + qualifier = stringParts[1]; + } - /** - * Returns the working directory. - * - * @return the working directory - */ - public File getDirectory() { - return directory; - } - public GrailsProjectConfig getProjectConfig() { - return config; - } + String[] numberParts = stringParts[0].split("\\."); // NOI18N + if (numberParts.length < 1 || numberParts.length > 4) { + throw new IllegalArgumentException(version); + } + try { + Integer[] parsed = new Integer[4]; + for (int i = 0; i < numberParts.length; i++) { + parsed[i] = Integer.valueOf(numberParts[i]); + } + return new Version(parsed[0], parsed[1], parsed[2], parsed[3], qualifier); + } catch (NumberFormatException ex) { + throw new IllegalArgumentException(version, ex); + } + } - /** - * Returns the command arguments. - * - * @return the command arguments - */ - public String[] getArguments() { - return arguments.clone(); - } + public int getMajor() { + return major; + } - /** - * Returns the environment properties. - * - * @return the environment properties - */ - public Properties getProps() { - return new Properties(props); - } + public int getMinor() { + return minor == null ? 0 : minor.intValue(); + } - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final CommandDescriptor other = (CommandDescriptor) obj; - if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) { - return false; - } - return true; - } + public int getMicro() { + return micro == null ? 0 : micro.intValue(); + } - @Override - public int hashCode() { - int hash = 7; - hash = 41 * hash + (this.name != null ? this.name.hashCode() : 0); - return hash; - } + public int getUpdate() { + return update == null ? 0 : update.intValue(); + } + public String getQualifier() { + return qualifier == null ? "" : qualifier; // NOI18N + } - } + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final Version other = (Version) obj; + if (this.getMajor() != other.getMajor()) { + return false; + } + if (this.getMinor() != other.getMinor()) { + return false; + } + if (this.getMicro() != other.getMicro()) { + return false; + } + if (this.getUpdate() != other.getUpdate()) { + return false; + } + if (!this.getQualifier().equals(other.getQualifier())) { + return false; + } + return true; + } - public static final class Version implements Comparable { + @Override + public int hashCode() { + int hash = 7; + hash = 71 * hash + this.getMajor(); + hash = 71 * hash + this.getMinor(); + hash = 71 * hash + this.getMicro(); + hash = 71 * hash + this.getUpdate(); + hash = 71 * hash + this.getQualifier().hashCode(); + return hash; + } - public static final Version VERSION_DEFAULT = new Version(1, null, null, null, null); + public int compareTo(Version o) { + if (this == o) { + return 0; + } - public static final Version VERSION_1_1 = new Version(1, 1, null, null, null); + int result = this.getMajor() - o.getMajor(); + if (result != 0) { + return result; + } - private final int major; + result = this.getMinor() - o.getMinor(); + if (result != 0) { + return result; + } - private final Integer minor; + result = this.getMicro() - o.getMicro(); + if (result != 0) { + return result; + } - private final Integer micro; + result = this.getUpdate() - o.getUpdate(); + if (result != 0) { + return result; + } - private final Integer update; + return this.getQualifier().compareTo(o.getQualifier()); + } - private final String qualifier; + @Override + public String toString() { + if (asString == null) { + StringBuilder builder = new StringBuilder(); + builder.append(major); - private String asString; + if (minor != null || micro != null || update != null) { + appendSeparator(builder); + builder.append(minor == null ? 0 : minor); + } + if (micro != null || update != null) { + appendSeparator(builder); + builder.append(micro == null ? 0 : micro); + } + if (update != null) { + appendSeparator(builder); + builder.append(update == null ? 0 : update); + } + if (qualifier != null) { + builder.append('-'); // NOI18N + builder.append(qualifier); + } - protected Version(int major, Integer minor, Integer micro, Integer update, String qualifier) { - this.major = major; - this.minor = minor; - this.micro = micro; - this.update = update; - this.qualifier = qualifier; - } + asString = builder.toString(); + } + return asString; + } - public static Version valueOf(String version) { - String[] stringParts = version.split("-"); // NOI18N + private void appendSeparator(StringBuilder builder) { + if (builder.length() > 0 && builder.charAt(builder.length() - 1) != '.') { // NOI18N + builder.append('.'); // NOI18N + } + } + } - String qualifier = null; - if (stringParts.length > 2) { - throw new IllegalArgumentException(version); - } - if (stringParts.length == 2) { - qualifier = stringParts[1]; - } + private static class GrailsCallable implements Callable { + // FIXME: get rid of those proxy constants as soon as some NB Proxy API is available + private static final String USE_PROXY_AUTHENTICATION = "useProxyAuthentication"; // NOI18N + private static final String PROXY_AUTHENTICATION_USERNAME = "proxyAuthenticationUsername"; // NOI18N + private static final String PROXY_AUTHENTICATION_PASSWORD = "proxyAuthenticationPassword"; // NOI18N + private final CommandDescriptor descriptor; - String[] numberParts = stringParts[0].split("\\."); // NOI18N - if (numberParts.length < 1 || numberParts.length > 4) { - throw new IllegalArgumentException(version); - } - try { - Integer[] parsed = new Integer[4]; - for (int i = 0; i < numberParts.length; i++) { - parsed[i] = Integer.valueOf(numberParts[i]); - } - return new Version(parsed[0], parsed[1], parsed[2], parsed[3], qualifier); - } catch (NumberFormatException ex) { - throw new IllegalArgumentException(version, ex); - } - } + public GrailsCallable(CommandDescriptor descriptor) { + this.descriptor = descriptor; + } - public int getMajor() { - return major; - } + public Process call() throws Exception { + String executable = ""; - public int getMinor() { - return minor == null ? 0 : minor.intValue(); - } + File grailsExecutable = null; + if (!descriptor.debug) { + executable = Utilities.isWindows() ? RuntimeHelper.WIN_DEBUG_EXECUTABLE : RuntimeHelper.NIX_DEBUG_EXECUTABLE; + if (RuntimeHelper.isDebian(new File(GrailsSettings.getInstance().getGrailsBase()))) { + grailsExecutable = new File(RuntimeHelper.DEB_EXECUTABLE); + } else { + grailsExecutable = new File(GrailsSettings.getInstance().getGrailsBase(), executable); + } + } else { + executable = Utilities.isWindows() ? RuntimeHelper.WIN_EXECUTABLE : RuntimeHelper.NIX_EXECUTABLE; + if (RuntimeHelper.isDebian(new File(GrailsSettings.getInstance().getGrailsBase()))) { + grailsExecutable = new File(RuntimeHelper.DEB_DEBUG_EXECUTABLE); + } else { + grailsExecutable = new File(GrailsSettings.getInstance().getGrailsBase(), executable); + } + } - public int getMicro() { - return micro == null ? 0 : micro.intValue(); - } + if (!grailsExecutable.exists()) { + LOGGER.log(Level.WARNING, "Executable doesn't exist: " + grailsExecutable.getAbsolutePath()); - public int getUpdate() { - return update == null ? 0 : update.intValue(); - } + return null; + } - public String getQualifier() { - return qualifier == null ? "" : qualifier; // NOI18N - } + LOGGER.log(Level.FINEST, "About to run: {0}", descriptor.getName()); - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final Version other = (Version) obj; - if (this.getMajor() != other.getMajor()) { - return false; - } - if (this.getMinor() != other.getMinor()) { - return false; - } - if (this.getMicro() != other.getMicro()) { - return false; - } - if (this.getUpdate() != other.getUpdate()) { - return false; - } - if (!this.getQualifier().equals(other.getQualifier())) { - return false; - } - return true; - } + Properties props = new Properties(descriptor.getProps()); + GrailsEnvironment env = descriptor.getProjectConfig() != null + ? descriptor.getProjectConfig().getEnvironment() + : null; - @Override - public int hashCode() { - int hash = 7; - hash = 71 * hash + this.getMajor(); - hash = 71 * hash + this.getMinor(); - hash = 71 * hash + this.getMicro(); - hash = 71 * hash + this.getUpdate(); - hash = 71 * hash + this.getQualifier().hashCode(); - return hash; - } + if (env != null && env.isCustom()) { + props.setProperty("grails.env", env.toString()); // NOI18N + } - public int compareTo(Version o) { - if (this == o) { - return 0; - } + if (descriptor.getProjectConfig() != null && IDE_RUN_COMMAND.equals(descriptor.getName())) { + String port = descriptor.getProjectConfig().getPort(); + if (port != null) { + props.setProperty("server.port", port); // NOI18N + } + } - int result = this.getMajor() - o.getMajor(); - if (result != 0) { - return result; - } + // XXX this is workaround for jline bug (native access to console on windows) used by grails + props.setProperty("jline.WindowsTerminal.directConsole", "false"); // NOI18N - result = this.getMinor() - o.getMinor(); - if (result != 0) { - return result; - } + String proxyString = getNetBeansHttpProxy(props); - result = this.getMicro() - o.getMicro(); - if (result != 0) { - return result; - } + StringBuilder command = new StringBuilder(); + if (env != null && !env.isCustom()) { + command.append(" ").append(env.toString()); + } + command.append(" ").append(descriptor.getName()); + command.append(" ").append(createCommandArguments(descriptor.getArguments())); - result = this.getUpdate() - o.getUpdate(); - if (result != 0) { - return result; - } + // FIXME fix this hack - needed for proper process tree kill + // see KillableProcess + String mark = ""; + if (Utilities.isWindows() && GUARDED_COMMANDS.contains(descriptor.getName())) { + mark = UNIQUE_MARK.getAndIncrement() + descriptor.getDirectory().getAbsolutePath(); + command.append(" ").append("REM NB:" + mark); // NOI18N + } - return this.getQualifier().compareTo(o.getQualifier()); - } + LOGGER.log(Level.FINEST, "Command is: {0}", command.toString()); - @Override - public String toString() { - if (asString == null) { - StringBuilder builder = new StringBuilder(); - builder.append(major); + NbProcessDescriptor grailsProcessDesc = new NbProcessDescriptor( + grailsExecutable.getAbsolutePath(), command.toString()); - if (minor != null || micro != null || update != null) { - appendSeparator(builder); - builder.append(minor == null ? 0 : minor); - } - if (micro != null || update != null) { - appendSeparator(builder); - builder.append(micro == null ? 0 : micro); - } - if (update != null) { - appendSeparator(builder); - builder.append(update == null ? 0 : update); - } - if (qualifier != null) { - builder.append('-'); // NOI18N - builder.append(qualifier); - } + String javaHome = null; + JavaPlatform javaPlatform; + if (descriptor.getProjectConfig() != null) { + javaPlatform = descriptor.getProjectConfig().getJavaPlatform(); + } else { + javaPlatform = JavaPlatformManager.getDefault().getDefaultPlatform(); + } - asString = builder.toString(); - } - return asString; - } + Collection dirs = javaPlatform.getInstallFolders(); + if (dirs.size() == 1) { + File file = FileUtil.toFile(dirs.iterator().next()); + if (file != null) { + javaHome = file.getAbsolutePath(); + } + } - private void appendSeparator(StringBuilder builder) { - if (builder.length() > 0 && builder.charAt(builder.length() - 1) != '.') { // NOI18N - builder.append('.'); // NOI18N - } - } + String[] envp = new String[]{ + "GRAILS_HOME=" + GrailsSettings.getInstance().getGrailsBase(), // NOI18N + "JAVA_HOME=" + javaHome, // NOI18N + "http_proxy=" + proxyString, // NOI18N + "HTTP_PROXY=" + proxyString, // NOI18N + "JAVA_OPTS=" + createJvmArguments(props) + }; - } + // no executable check before java6 + Process process = null; + try { + process = new KillableProcess( + grailsProcessDesc.exec(null, envp, true, descriptor.getDirectory()), + descriptor.getName(), mark); + } catch (IOException ex) { + NotifyDescriptor desc = new NotifyDescriptor.Message( + NbBundle.getMessage(GrailsPlatform.class, "MSG_StartFailedIOE", + grailsExecutable.getAbsolutePath()), NotifyDescriptor.ERROR_MESSAGE); + DialogDisplayer.getDefault().notifyLater(desc); + throw ex; + } - private static class GrailsCallable implements Callable { + checkForServer(descriptor, process); + return process; + } - // FIXME: get rid of those proxy constants as soon as some NB Proxy API is available - private static final String USE_PROXY_AUTHENTICATION = "useProxyAuthentication"; // NOI18N + /** + * FIXME: get rid of the whole method as soon as some NB Proxy API is + * available. + */ + private static String getNetBeansHttpProxy(Properties props) { + String host = System.getProperty("http.proxyHost"); // NOI18N + if (host == null) { + return null; + } - private static final String PROXY_AUTHENTICATION_USERNAME = "proxyAuthenticationUsername"; // NOI18N + String portHttp = System.getProperty("http.proxyPort"); // NOI18N + int port; - private static final String PROXY_AUTHENTICATION_PASSWORD = "proxyAuthenticationPassword"; // NOI18N + try { + port = Integer.parseInt(portHttp); + } catch (NumberFormatException e) { + port = 8080; + } - private final CommandDescriptor descriptor; + Preferences prefs = NbPreferences.root().node("org/netbeans/core"); // NOI18N + boolean useAuth = prefs.getBoolean(USE_PROXY_AUTHENTICATION, false); - public GrailsCallable(CommandDescriptor descriptor) { - this.descriptor = descriptor; - } + String auth = ""; + if (useAuth) { + String username = prefs.get(PROXY_AUTHENTICATION_USERNAME, ""); + String password = prefs.get(PROXY_AUTHENTICATION_PASSWORD, ""); - public Process call() throws Exception { - String executable = Utilities.isWindows() ? RuntimeHelper.WIN_EXECUTABLE : RuntimeHelper.NIX_EXECUTABLE; - File grailsExecutable = null; - if (RuntimeHelper.isDebian(new File(GrailsSettings.getInstance().getGrailsBase()))) { - grailsExecutable = new File(RuntimeHelper.DEB_EXECUTABLE); - } else { - grailsExecutable = new File(GrailsSettings.getInstance().getGrailsBase(), executable); - } + auth = username + ":" + password + '@'; // NOI18N - if (!grailsExecutable.exists()) { - LOGGER.log(Level.WARNING, "Executable doesn't exist: " - + grailsExecutable.getAbsolutePath()); + if (!props.contains("http.proxyUser")) { // NOI18N + props.setProperty("http.proxyUser", prefs.get(PROXY_AUTHENTICATION_USERNAME, "")); // NOI18N + } + if (!props.contains("http.proxyPassword")) { // NOI18N + props.setProperty("http.proxyPassword", prefs.get(PROXY_AUTHENTICATION_PASSWORD, "")); // NOI18N + } + } - return null; - } + if (!props.contains("http.proxyHost")) { // NOI18N + props.setProperty("http.proxyHost", host); // NOI18N + } + if (!props.contains("http.proxyPort")) { // NOI18N + props.setProperty("http.proxyPort", Integer.toString(port)); // NOI18N + } - LOGGER.log(Level.FINEST, "About to run: {0}", descriptor.getName()); + // Gem requires "http://" in front of the port name if it's not already there + if (host.indexOf(':') == -1) { + host = "http://" + auth + host; // NOI18N + } - Properties props = new Properties(descriptor.getProps()); - GrailsEnvironment env = descriptor.getProjectConfig() != null - ? descriptor.getProjectConfig().getEnvironment() - : null; - - if (env != null && env.isCustom()) { - props.setProperty("grails.env", env.toString()); // NOI18N - } - - if (descriptor.getProjectConfig() != null && IDE_RUN_COMMAND.equals(descriptor.getName())) { - String port = descriptor.getProjectConfig().getPort(); - if (port != null) { - props.setProperty("server.port", port); // NOI18N - } - } - - // XXX this is workaround for jline bug (native access to console on windows) used by grails - props.setProperty("jline.WindowsTerminal.directConsole", "false"); // NOI18N - - String proxyString = getNetBeansHttpProxy(props); - - StringBuilder command = new StringBuilder(); - if (env != null && !env.isCustom()) { - command.append(" ").append(env.toString()); - } - command.append(" ").append(descriptor.getName()); - command.append(" ").append(createCommandArguments(descriptor.getArguments())); - - // FIXME fix this hack - needed for proper process tree kill - // see KillableProcess - String mark = ""; - if (Utilities.isWindows() && GUARDED_COMMANDS.contains(descriptor.getName())) { - mark = UNIQUE_MARK.getAndIncrement() + descriptor.getDirectory().getAbsolutePath(); - command.append(" ").append("REM NB:" + mark); // NOI18N - } - - LOGGER.log(Level.FINEST, "Command is: {0}", command.toString()); - - NbProcessDescriptor grailsProcessDesc = new NbProcessDescriptor( - grailsExecutable.getAbsolutePath(), command.toString()); - - String javaHome = null; - JavaPlatform javaPlatform; - if (descriptor.getProjectConfig() != null) { - javaPlatform = descriptor.getProjectConfig().getJavaPlatform(); - } else { - javaPlatform = JavaPlatformManager.getDefault().getDefaultPlatform(); - } - - Collection dirs = javaPlatform.getInstallFolders(); - if (dirs.size() == 1) { - File file = FileUtil.toFile(dirs.iterator().next()); - if (file != null) { - javaHome = file.getAbsolutePath(); - } - } - - String[] envp = new String[] { - "GRAILS_HOME=" + GrailsSettings.getInstance().getGrailsBase(), // NOI18N - "JAVA_HOME=" + javaHome, // NOI18N - "http_proxy=" + proxyString, // NOI18N - "HTTP_PROXY=" + proxyString, // NOI18N - "JAVA_OPTS=" + createJvmArguments(props) - }; - - // no executable check before java6 - Process process = null; - try { - process = new KillableProcess( - grailsProcessDesc.exec(null, envp, true, descriptor.getDirectory()), - descriptor.getName(), mark); - } catch (IOException ex) { - NotifyDescriptor desc = new NotifyDescriptor.Message( - NbBundle.getMessage(GrailsPlatform.class, "MSG_StartFailedIOE", - grailsExecutable.getAbsolutePath()), NotifyDescriptor.ERROR_MESSAGE); - DialogDisplayer.getDefault().notifyLater(desc); - throw ex; - } - - checkForServer(descriptor, process); - return process; - } - - /** - * FIXME: get rid of the whole method as soon as some NB Proxy API is - * available. - */ - private static String getNetBeansHttpProxy(Properties props) { - String host = System.getProperty("http.proxyHost"); // NOI18N - if (host == null) { - return null; - } - - String portHttp = System.getProperty("http.proxyPort"); // NOI18N - int port; - - try { - port = Integer.parseInt(portHttp); - } catch (NumberFormatException e) { - port = 8080; - } - - Preferences prefs = NbPreferences.root().node("org/netbeans/core"); // NOI18N - boolean useAuth = prefs.getBoolean(USE_PROXY_AUTHENTICATION, false); - - String auth = ""; - if (useAuth) { - String username = prefs.get(PROXY_AUTHENTICATION_USERNAME, ""); - String password = prefs.get(PROXY_AUTHENTICATION_PASSWORD, ""); - - auth = username + ":" + password + '@'; // NOI18N - - if (!props.contains("http.proxyUser")) { // NOI18N - props.setProperty("http.proxyUser", prefs.get(PROXY_AUTHENTICATION_USERNAME, "")); // NOI18N - } - if (!props.contains("http.proxyPassword")) { // NOI18N - props.setProperty("http.proxyPassword", prefs.get(PROXY_AUTHENTICATION_PASSWORD, "")); // NOI18N - } - } - - if (!props.contains("http.proxyHost")) { // NOI18N - props.setProperty("http.proxyHost", host); // NOI18N - } - if (!props.contains("http.proxyPort")) { // NOI18N - props.setProperty("http.proxyPort", Integer.toString(port)); // NOI18N - } - - // Gem requires "http://" in front of the port name if it's not already there - if (host.indexOf(':') == -1) { - host = "http://" + auth + host; // NOI18N - } - - return host + ":" + port; // NOI18N - } - - } + return host + ":" + port; // NOI18N + } + } } diff --git a/groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/api/GrailsRuntimeTest.java b/groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/api/GrailsRuntimeTest.java --- a/groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/api/GrailsRuntimeTest.java +++ b/groovy.grails/test/unit/src/org/netbeans/modules/groovy/grails/api/GrailsRuntimeTest.java @@ -89,7 +89,7 @@ GrailsProjectConfig config = GrailsProjectConfig.forProject(project); GrailsPlatform.CommandDescriptor desc = GrailsPlatform.CommandDescriptor.forProject( - "test", getWorkDir(), config, new String[]{}, null); + "test", false, getWorkDir(), config, new String[]{}, null); assertEquals("test", desc.getName()); assertEquals(getWorkDir(), desc.getDirectory()); @@ -99,7 +99,7 @@ String[] args = new String[] {"arg1", "arg2"}; desc = GrailsPlatform.CommandDescriptor.forProject( - "test", getWorkDir(), config, args, null); + "test", false, getWorkDir(), config, args, null); assertEquals("test", desc.getName()); assertEquals(getWorkDir(), desc.getDirectory()); @@ -112,7 +112,7 @@ props.setProperty("prop2", "value2"); desc = GrailsPlatform.CommandDescriptor.forProject( - "test", getWorkDir(), config, args, props); + "test", false, getWorkDir(), config, args, props); assertEquals("test", desc.getName()); assertEquals(getWorkDir(), desc.getDirectory()); # HG changeset patch # User Alex Kotchnev # Date 1244097458 14400 # Node ID abd305f116dbe544f524e29cc6cc67e05d5bd11f # Parent 6934481df4a5de52afd4e12405252a046f728c33 attempted to add a debug option to run grails command diff --git a/groovy.grailsproject/manifest.mf b/groovy.grailsproject/manifest.mf --- a/groovy.grailsproject/manifest.mf +++ b/groovy.grailsproject/manifest.mf @@ -1,7 +1,7 @@ Manifest-Version: 1.0 AutoUpdate-Show-In-Client: false OpenIDE-Module: org.netbeans.modules.groovy.grailsproject +OpenIDE-Module-Implementation-Version: 1 OpenIDE-Module-Layer: org/netbeans/modules/groovy/grailsproject/resources/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/grailsproject/resources/Bundle.properties -OpenIDE-Module-Specification-Version: 1.17 diff --git a/groovy.grailsproject/nbproject/project.properties b/groovy.grailsproject/nbproject/project.properties --- a/groovy.grailsproject/nbproject/project.properties +++ b/groovy.grailsproject/nbproject/project.properties @@ -3,3 +3,4 @@ javadoc.arch=${basedir}/arch.xml nbm.homepage=http://wiki.netbeans.org/groovy nbm.module.author=Martin Adamek, Matthias Schmidt +spec.version.base=1.17 diff --git a/groovy.grailsproject/nbproject/project.xml b/groovy.grailsproject/nbproject/project.xml --- a/groovy.grailsproject/nbproject/project.xml +++ b/groovy.grailsproject/nbproject/project.xml @@ -15,6 +15,15 @@ + org.netbeans.api.debugger + + + + 1 + + + + org.netbeans.api.java @@ -60,12 +69,12 @@ - org.netbeans.modules.editor.lib + org.netbeans.modules.editor.lib2 1 - 1.28 + 1.12 # HG changeset patch # User Jaroslav Tulach # Date 1243930316 -7200 # Node ID f4762c2a4c79b903ecf766faf69ec9c3d5be33fb # Parent d4c8e0555fe59b8a729fcc47b38ab33bdfb58c0a Printing prefix and honoring autoloads diff --git a/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java b/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java --- a/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java +++ b/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java @@ -78,6 +78,7 @@ msgs = new StringWriter(); pw = new PrintWriter(msgs); CountingSecurityManager.prefix = prefix; + System.err.println("setting prefix to " + prefix); Statistics.reset(); } diff --git a/performance/test/unit/src/org/netbeans/performance/scalability/ExpandFolderTest.java b/performance/test/unit/src/org/netbeans/performance/scalability/ExpandFolderTest.java --- a/performance/test/unit/src/org/netbeans/performance/scalability/ExpandFolderTest.java +++ b/performance/test/unit/src/org/netbeans/performance/scalability/ExpandFolderTest.java @@ -79,6 +79,7 @@ Configuration config = NbModuleSuite.createConfiguration(ExpandFolderTest.class) .clusters(clusters) .enableModules(modules) + .honorAutoloadEager(true) .gui(false); return NbModuleSuite.create(config); } # HG changeset patch # User Pavel Flaska # Date 1243928944 -7200 # Node ID 539ca8659e6895208c4561aff5171110d5b63e0a # Parent f4762c2a4c79b903ecf766faf69ec9c3d5be33fb Fixed on Mac - do not check additional jdk libraries. diff --git a/ide.kit/test/qa-functional/src/org/netbeans/test/ide/CountingSecurityManager.java b/ide.kit/test/qa-functional/src/org/netbeans/test/ide/CountingSecurityManager.java --- a/ide.kit/test/qa-functional/src/org/netbeans/test/ide/CountingSecurityManager.java +++ b/ide.kit/test/qa-functional/src/org/netbeans/test/ide/CountingSecurityManager.java @@ -57,6 +57,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import junit.framework.Assert; +import org.openide.util.Utilities; /** * @@ -460,7 +461,10 @@ } } } - + if (file.endsWith("harness/modules/org-netbeans-modules-nbjunit.jar")) { + return false; + } + // mac osx dirs = System.getProperty("java.ext.dirs"); if (dirs != null) { @@ -470,6 +474,9 @@ } } } + if (Utilities.isMac() && file.startsWith("/System/Library/Frameworks/JavaVM.framework/")) { + return false; + } return true; } # HG changeset patch # User Pavel Flaska # Date 1243930960 -7200 # Node ID 80e8c7dcd35adb4102771f84c3b83f5410a2780c # Parent 539ca8659e6895208c4561aff5171110d5b63e0a Tests fixed. diff --git a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindSubclassesTest.java b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindSubclassesTest.java --- a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindSubclassesTest.java +++ b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindSubclassesTest.java @@ -56,7 +56,6 @@ import org.netbeans.junit.Log; import org.netbeans.junit.NbModuleSuite; import org.netbeans.junit.NbPerformanceTest; -import org.netbeans.modules.refactoring.api.Problem; import org.netbeans.modules.refactoring.api.RefactoringElement; import org.netbeans.modules.refactoring.api.RefactoringSession; import org.netbeans.modules.refactoring.api.WhereUsedQuery; @@ -102,7 +101,6 @@ timer = Logger.getLogger("TIMER.RefactoringPrepare"); timer.setLevel(Level.FINE); timer.addHandler(getHandler()); - ClasspathInfo cp = ClasspathInfo.create(boot, compile, source); Log.enableInstances(Logger.getLogger("TIMER"), "JavacParser", Level.FINEST); FileObject testFile = getProjectDir().getFileObject("/src/simplej2seapp/Main.java"); @@ -121,7 +119,8 @@ ClasspathInfo cpi = RetoucheUtils.getClasspathInfoFor(TreePathHandle.create(object, controller)); wuq[0].getContext().add(cpi); } - }, false); + }, false).get(); + wuq[0].putValue(WhereUsedQueryConstants.FIND_SUBCLASSES, true); RefactoringSession rs = RefactoringSession.create("Session"); wuq[0].prepare(rs); @@ -130,8 +129,8 @@ StringBuilder sb = new StringBuilder(); sb.append("Symbol: '").append(symbolName[0]).append("'"); sb.append('\n').append("Number of usages: ").append(elems.size()).append('\n'); - long prepare = getHandler().get("refactoring.prepare"); try { + long prepare = getHandler().get("refactoring.prepare"); NbPerformanceTest.PerformanceData d = new NbPerformanceTest.PerformanceData(); d.name = "refactoring.prepare"+" (" + symbolName[0] + ", usages:" + elems.size() + ")"; d.value = prepare; @@ -152,6 +151,6 @@ } public static Test suite() throws InterruptedException { - return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(FindSubclassesTest.class, "testFindSub").gui(true)); + return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(FindSubclassesTest.class, "testFindSub").gui(false)); } } \ No newline at end of file diff --git a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindUsagesPerfTest.java b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindUsagesPerfTest.java --- a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindUsagesPerfTest.java +++ b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindUsagesPerfTest.java @@ -90,7 +90,7 @@ // find usages of symbols collected below final List handle = new ArrayList(); - src.runUserActionTask(new Task() { + src.runWhenScanFinished(new Task() { public void run(CompilationController controller) throws Exception { controller.toPhase(JavaSource.Phase.RESOLVED); @@ -99,12 +99,12 @@ handle.add(TreePathHandle.create(element, controller)); } } - }, false); + }, false).get(); // do find usages query for (final TreePathHandle element : handle) { - src.runUserActionTask(new Task() { + src.runWhenScanFinished(new Task() { public void run(CompilationController controller) throws Exception { controller.toPhase(JavaSource.Phase.RESOLVED); @@ -140,7 +140,7 @@ System.err.println(sb); } - }, false); + }, false).get(); System.gc(); System.gc(); } src = null; diff --git a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/MoveClassPerfTest.java b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/MoveClassPerfTest.java --- a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/MoveClassPerfTest.java +++ b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/MoveClassPerfTest.java @@ -92,7 +92,7 @@ final MoveRefactoring[] moveRef = new MoveRefactoring[1]; final CharSequence REFACTORED_OBJ = "org.gjt.sp.jedit.ActionSet"; - src.runUserActionTask(new Task() { + src.runWhenScanFinished(new Task() { public void run(CompilationController controller) throws Exception { controller.toPhase(JavaSource.Phase.RESOLVED); @@ -101,7 +101,7 @@ ClasspathInfo cpi = RetoucheUtils.getClasspathInfoFor(TreePathHandle.create(klass, controller)); moveRef[0].getContext().add(cpi); } - }, false); + }, false).get(); RefactoringSession rs = RefactoringSession.create("Session"); File f = FileUtil.toFile(getProjectDir().getFileObject("/src/org/gjt/sp")); @@ -136,6 +136,6 @@ } public static Test suite() throws InterruptedException { - return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(MoveClassPerfTest.class, "testMoveActionSet").gui(true)); + return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(MoveClassPerfTest.class, "testMoveActionSet").gui(false)); } } \ No newline at end of file diff --git a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/OpenDocumentsPerfTest.java b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/OpenDocumentsPerfTest.java --- a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/OpenDocumentsPerfTest.java +++ b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/OpenDocumentsPerfTest.java @@ -55,8 +55,6 @@ import org.netbeans.junit.Log; import org.netbeans.junit.NbModuleSuite; import org.netbeans.junit.NbPerformanceTest; -import org.netbeans.modules.java.source.usages.ClassIndexManager; -import org.netbeans.modules.refactoring.api.Problem; import org.netbeans.modules.refactoring.api.RefactoringElement; import org.netbeans.modules.refactoring.api.RefactoringSession; import org.netbeans.modules.refactoring.api.WhereUsedQuery; @@ -146,6 +144,6 @@ } public static Test suite() throws InterruptedException { - return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(OpenDocumentsPerfTest.class, "testOpenDocuments").gui(true)); + return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(OpenDocumentsPerfTest.class, "testOpenDocuments").gui(false)); } } \ No newline at end of file # HG changeset patch # User Jaroslav Tulach # Date 1243931764 -7200 # Node ID d1d8395a2e386bae46452c9979bda6cdf05c5b15 # Parent 80e8c7dcd35adb4102771f84c3b83f5410a2780c Trying to address failures on Windows by using getCanonicalPath diff --git a/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java b/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java --- a/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java +++ b/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java @@ -39,7 +39,9 @@ package org.netbeans.performance.scalability; +import java.io.File; import java.io.FileDescriptor; +import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; import java.security.Permission; @@ -48,6 +50,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicLong; import junit.framework.Assert; +import org.openide.util.Exceptions; /** * @@ -78,7 +81,12 @@ msgs = new StringWriter(); pw = new PrintWriter(msgs); CountingSecurityManager.prefix = prefix; - System.err.println("setting prefix to " + prefix); + try { + CountingSecurityManager.prefix = new File(prefix).getCanonicalPath(); + } catch (IOException ex) { + Exceptions.printStackTrace(ex); + } + System.err.println("setting prefix to " + CountingSecurityManager.prefix); Statistics.reset(); } # HG changeset patch # User Jaroslav Tulach # Date 1243934471 -7200 # Node ID 15df29c7d7db10d2c5e7fe19c80198ecd1b1b2bd # Parent d1d8395a2e386bae46452c9979bda6cdf05c5b15 #166023: System Slowness Detected Infrastructure diff --git a/o.n.core/arch.xml b/o.n.core/arch.xml --- a/o.n.core/arch.xml +++ b/o.n.core/arch.xml @@ -514,6 +514,12 @@ The context field is accessed from editor module by reflection from MultiKeymap. + + The module expects profiler to provide SelfProfileAction + and interacts with it as described in + profiler/test/unit/src/org/netbeans/modules/profiler/actions/SelfSamplerActionTest.java + test. +

diff --git a/o.n.core/src/org/netbeans/core/Bundle.properties b/o.n.core/src/org/netbeans/core/Bundle.properties --- a/o.n.core/src/org/netbeans/core/Bundle.properties +++ b/o.n.core/src/org/netbeans/core/Bundle.properties @@ -179,3 +179,9 @@ # NbAuthenticatorPanel NbAuthenticatorPanel.userNameLbl.text=&User Name: NbAuthenticatorPanel.passwordLbl.text=&Password: + +# TimableEventQueue +TEQ_LowPerformance=System slowness detected +# {0} time in ms +# {1} time in s +TEQ_BlockedFor=Not reponsive for {0,choice,0#{0} ms|5000#{1} s}. \ No newline at end of file diff --git a/o.n.core/src/org/netbeans/core/TimableEventQueue.java b/o.n.core/src/org/netbeans/core/TimableEventQueue.java --- a/o.n.core/src/org/netbeans/core/TimableEventQueue.java +++ b/o.n.core/src/org/netbeans/core/TimableEventQueue.java @@ -42,15 +42,32 @@ import java.awt.AWTEvent; import java.awt.EventQueue; import java.awt.Toolkit; -import java.util.EmptyStackException; -import java.util.Map; -import java.util.ResourceBundle; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.LinkedList; +import java.util.Queue; import java.util.logging.Level; -import java.util.logging.LogRecord; import java.util.logging.Logger; +import javax.swing.Action; import org.netbeans.core.startup.Main; +import org.openide.awt.Notification; +import org.openide.awt.NotificationDisplayer; +import org.openide.filesystems.FileObject; +import org.openide.filesystems.FileUtil; +import org.openide.loaders.DataObject; +import org.openide.nodes.Node; +import org.openide.util.ContextAwareAction; +import org.openide.util.Exceptions; +import org.openide.util.ImageUtilities; import org.openide.util.Mutex; +import org.openide.util.NbBundle; import org.openide.util.RequestProcessor; +import org.openide.util.lookup.Lookups; +import org.openide.windows.WindowManager; /** * Logging event queue that can report problems about too long execution times @@ -62,19 +79,20 @@ implements Runnable { private static final Logger LOG = Logger.getLogger(TimableEventQueue.class.getName()); private static final RequestProcessor RP = new RequestProcessor("Timeable Event Queue Watch Dog", 1, true); // NOI18N - private static final int QUANTUM = Integer.getInteger("org.netbeans.core.TimeableEventQueue.quantum", 5000); // NOI18N - private static final int PAUSE = Integer.getInteger("org.netbeans.core.TimeableEventQueue.pause", 60000); // NOI18N + private static final int QUANTUM = Integer.getInteger("org.netbeans.core.TimeableEventQueue.quantum", 100); // NOI18N + private static final int REPORT = Integer.getInteger("org.netbeans.core.TimeableEventQueue.report", 1000); // NOI18N + private static final int PAUSE = Integer.getInteger("org.netbeans.core.TimeableEventQueue.pause", 15000); // NOI18N - private final RequestProcessor.Task TIMEOUT; - private volatile Map stack; private volatile long ignoreTill; private volatile long start; - + private volatile ActionListener stoppable; + private final Queue pending; public TimableEventQueue() { TIMEOUT = RP.create(this); TIMEOUT.setPriority(Thread.MIN_PRIORITY); + pending = new LinkedList(); } static void initialize() { @@ -97,74 +115,86 @@ e.printStackTrace(); } } + @Override protected void dispatchEvent(AWTEvent event) { try { - tick(); + tick("dispatchEvent"); // NOI18N super.dispatchEvent(event); } finally { done(); } } - @Override - public void postEvent(AWTEvent theEvent) { - try { - tick(); - super.postEvent(theEvent); - } finally { - done(); - } - } - - @Override - public synchronized void push(EventQueue newEventQueue) { - try { - tick(); - super.push(newEventQueue); - } finally { - done(); - } - } - private void done() { - stack = null; TIMEOUT.cancel(); long time = System.currentTimeMillis() - start; - if (time > 50) { - LOG.log(Level.FINE, "done, timer stopped, took {0}", time); + if (time > QUANTUM) { + LOG.log(Level.FINE, "done, timer stopped, took {0}", time); // NOI18N + if (time > REPORT) { + LOG.log(Level.WARNING, "too much time in AWT thread {0}", stoppable); // NOI18N + ActionListener ss = stoppable; + if (ss != null) { + try { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + DataOutputStream dos = new DataOutputStream(out); + ss.actionPerformed(new ActionEvent(dos, 0, "write")); // NOI18N + dos.close(); + pending.add(new NotifySnapshot(out.toByteArray(), time)); + if (pending.size() > 5) { + pending.remove().clear(); + } + stoppable = null; + } catch (Exception ex) { + Exceptions.printStackTrace(ex); + } + ignoreTill = System.currentTimeMillis() + PAUSE; + } + } } else { LOG.log(Level.FINEST, "done, timer stopped, took {0}", time); } + ActionListener ss = stoppable; + if (ss != null) { + ss.actionPerformed(new ActionEvent(this, 0, "cancel")); // NOI18N + stoppable = null; + } + return; } - private void tick() { - stack = null; + private void tick(String name) { start = System.currentTimeMillis(); - if (start >= ignoreTill) { - LOG.log(Level.FINEST, "tick, schedule a timer at {0}", start); + if (start >= ignoreTill && WindowManager.getDefault().getMainWindow().isShowing()) { + LOG.log(Level.FINEST, "tick, schedule a timer for {0}", name); TIMEOUT.schedule(QUANTUM); } } public void run() { - stack = Thread.getAllStackTraces(); - LOG.log(Level.FINER, "timer running"); - for (int i = 0; i < 10; i++) { - if (Thread.interrupted()) { - LOG.log(Level.FINER, "timer cancelled"); - return; - } - Thread.yield(); - System.gc(); - System.runFinalization(); - } - final Map myStack = stack; - if (myStack == null) { - LOG.log(Level.FINER, "timer cancelled"); + if (stoppable != null) { + LOG.log(Level.WARNING, "Still previous controller {0}", stoppable); return; } - + Runnable selfSampler = (Runnable)createSelfSampler(); + if (selfSampler != null) { + selfSampler.run(); + stoppable = (ActionListener)selfSampler; + } + } + + private static Object createSelfSampler() { + FileObject fo = FileUtil.getConfigFile("Actions/Profile/org-netbeans-modules-profiler-actions-SelfSamplerAction.instance"); + if (fo == null) { + return null; + } + Action a = (Action)fo.getAttribute("delegate"); // NOI18N + if (a == null) { + return null; + } + return a.getValue("logger-awt"); // NOI18N + } + + /* long now = System.currentTimeMillis(); ignoreTill = now + PAUSE; long howLong = now - start; @@ -179,7 +209,7 @@ // UI_LOG.log(rec); LOG.log(rec); } - + private static final class EQException extends Exception { private volatile Map stack; @@ -243,4 +273,41 @@ } } + */ + + private static final class NotifySnapshot implements ActionListener { + private final byte[] content; + private final Notification note; + + NotifySnapshot(byte[] arr, long time) { + content = arr; + note = NotificationDisplayer.getDefault().notify( + NbBundle.getMessage(NotifySnapshot.class, "TEQ_LowPerformance"), + ImageUtilities.loadImageIcon("org/netbeans/core/resources/vilik.png", true), + NbBundle.getMessage(NotifySnapshot.class, "TEQ_BlockedFor", time, time / 1000), + this, NotificationDisplayer.Priority.LOW + ); + } + + public void actionPerformed(ActionEvent e) { + try { + FileObject fo = FileUtil.createMemoryFileSystem().getRoot().createData("slow.nps"); + OutputStream os = fo.getOutputStream(); + os.write(content); + os.close(); + final Node obj = DataObject.find(fo).getNodeDelegate(); + Action a = obj.getPreferredAction(); + if (a instanceof ContextAwareAction) { + a = ((ContextAwareAction)a).createContextAwareInstance(Lookups.singleton(obj)); + } + a.actionPerformed(e); + } catch (IOException ex) { + Exceptions.printStackTrace(ex); + } + } + + public void clear() { + note.clear(); + } + } } diff --git a/profiler/src/org/netbeans/modules/profiler/actions/SelfSamplerAction.java b/profiler/src/org/netbeans/modules/profiler/actions/SelfSamplerAction.java --- a/profiler/src/org/netbeans/modules/profiler/actions/SelfSamplerAction.java +++ b/profiler/src/org/netbeans/modules/profiler/actions/SelfSamplerAction.java @@ -42,13 +42,18 @@ import java.awt.Toolkit; import java.awt.event.AWTEventListener; import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.awt.event.KeyEvent; +import java.io.DataOutputStream; +import java.nio.channels.WritableByteChannel; import java.util.Collections; +import java.util.concurrent.Callable; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicReference; import javax.swing.AbstractAction; import javax.swing.Action; import org.netbeans.lib.profiler.common.ProfilingSettingsPresets; @@ -56,6 +61,7 @@ import org.netbeans.lib.profiler.results.cpu.StackTraceSnapshotBuilder; import org.netbeans.modules.profiler.LoadedSnapshot; import org.netbeans.modules.profiler.ResultsManager; +import org.openide.util.Exceptions; import org.openide.util.ImageUtilities; import org.openide.util.NbBundle; @@ -74,12 +80,7 @@ private static final String ACTION_NAME_STOP = NbBundle.getMessage(SelfSamplerAction.class, "SelfSamplerAction_ActionNameStop"); // private static final String ACTION_DESCR = NbBundle.getMessage(SelfSamplerAction.class, "SelfSamplerAction_ActionDescription"); private static final String THREAD_NAME = NbBundle.getMessage(SelfSamplerAction.class, "SelfSamplerAction_ThreadName"); - private StackTraceSnapshotBuilder builder; - private ThreadFactory threadFactory; - private ScheduledExecutorService executor; - - private AtomicBoolean isRunning = new AtomicBoolean(false); - private long startTime; + private final AtomicReference RUNNING = new AtomicReference(); //~ Constructors ------------------------------------------------------------------------------------------------------------- private SelfSamplerAction() { @@ -101,24 +102,6 @@ //~ Methods ------------------------------------------------------------------------------------------------------------------ - /** - * @return the builder - */ - private synchronized StackTraceSnapshotBuilder getBuilder() { - if (builder == null) { - builder = new StackTraceSnapshotBuilder(); - threadFactory = new ThreadFactory() { - public Thread newThread(Runnable r) { - return new Thread(r, THREAD_NAME); - } - }; - builder.setIgnoredThreads(Collections.singleton(THREAD_NAME)); - } - return builder; - } - - - @Override public boolean isEnabled() { return true; @@ -128,42 +111,23 @@ * Invoked when an action occurs. */ public void actionPerformed(final ActionEvent e) { - if (isRunning.compareAndSet(false, true)) { + Controller c; + if (RUNNING.compareAndSet(null, c = new Controller(THREAD_NAME))) { putValue(Action.NAME, ACTION_NAME_STOP); putValue(Action.SMALL_ICON, ImageUtilities.loadImageIcon( "org/netbeans/modules/profiler/actions/resources/modifyProfiling.png" //NOI18N - , false) + , false) ); - final StackTraceSnapshotBuilder b = getBuilder(); - executor = Executors.newSingleThreadScheduledExecutor(threadFactory); - startTime = System.currentTimeMillis(); - executor.scheduleAtFixedRate(new Runnable() { - public void run() { - b.addStacktrace(Thread.getAllStackTraces(), System.nanoTime()); - } - }, 10, 10, TimeUnit.MILLISECONDS); - } else if (isRunning.compareAndSet(true, false)) { + c.run(); + } else if ((c = RUNNING.getAndSet(null)) != null) { putValue(Action.NAME, ACTION_NAME_START); putValue(Action.SMALL_ICON, ImageUtilities.loadImageIcon( "org/netbeans/modules/profiler/actions/resources/openSnapshot.png" //NOI18N - , false) + , false) ); - try { - executor.shutdown(); - executor.awaitTermination(100, TimeUnit.MILLISECONDS); - CPUResultsSnapshot snapshot = getBuilder().createSnapshot(startTime, System.nanoTime()); - LoadedSnapshot loadedSnapshot = new LoadedSnapshot(snapshot, ProfilingSettingsPresets.createCPUPreset(), null, null); - loadedSnapshot.setSaved(true); - ResultsManager.getDefault().openSnapshot(loadedSnapshot); - getBuilder().reset(); - - } catch (CPUResultsSnapshot.NoDataAvailableException ex) { - ex.printStackTrace(); - } catch (InterruptedException ex) { - Thread.currentThread().interrupt(); - } + c.actionPerformed(new ActionEvent(this, 0, "show")); // NOI18N } } @@ -176,5 +140,75 @@ } } + @Override + public Object getValue(String key) { + Object o = super.getValue(key); + if (o == null && key.startsWith("logger-")) { // NOI18N + return new Controller(key); + } + return o; + } + + + private static final class Controller implements Runnable, ActionListener { + private final String name; + private StackTraceSnapshotBuilder builder; + private ThreadFactory threadFactory; + private ScheduledExecutorService executor; + private long startTime; + + public Controller(String n) { + name = n; + } + /** + * @return the builder + */ + private synchronized StackTraceSnapshotBuilder getBuilder() { + if (builder == null) { + builder = new StackTraceSnapshotBuilder(); + threadFactory = new ThreadFactory() { + public Thread newThread(Runnable r) { + return new Thread(r, name); + } + }; + builder.setIgnoredThreads(Collections.singleton(name)); + } + return builder; + } + + public void run() { + final StackTraceSnapshotBuilder b = getBuilder(); + executor = Executors.newSingleThreadScheduledExecutor(threadFactory); + startTime = System.currentTimeMillis(); + executor.scheduleAtFixedRate(new Runnable() { + public void run() { + b.addStacktrace(Thread.getAllStackTraces(), System.nanoTime()); + } + }, 10, 10, TimeUnit.MILLISECONDS); + } + + public void actionPerformed(ActionEvent e) { + try { + executor.shutdown(); + executor.awaitTermination(100, TimeUnit.MILLISECONDS); + if ("cancel".equals(e.getActionCommand())) { + return; + } + CPUResultsSnapshot snapshot = getBuilder().createSnapshot(startTime, System.nanoTime()); + LoadedSnapshot loadedSnapshot = new LoadedSnapshot(snapshot, ProfilingSettingsPresets.createCPUPreset(), null, null); + if ("write".equals(e.getActionCommand())) { + DataOutputStream dos = (DataOutputStream)e.getSource(); + loadedSnapshot.save(dos); + return; + } + loadedSnapshot.setSaved(true); + ResultsManager.getDefault().openSnapshot(loadedSnapshot); + } catch (Exception ex) { + Exceptions.printStackTrace(ex); + } finally { + getBuilder().reset(); + } + } + } } diff --git a/profiler/test/unit/src/org/netbeans/modules/profiler/actions/SelfSamplerActionTest.java b/profiler/test/unit/src/org/netbeans/modules/profiler/actions/SelfSamplerActionTest.java new file mode 100644 --- /dev/null +++ b/profiler/test/unit/src/org/netbeans/modules/profiler/actions/SelfSamplerActionTest.java @@ -0,0 +1,137 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.profiler.actions; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.DataOutputStream; +import java.io.OutputStream; +import java.util.logging.Level; +import javax.swing.Action; +import org.junit.Test; +import org.netbeans.junit.Log; +import org.netbeans.modules.profiler.ui.NpsDataObject; +import org.openide.cookies.OpenCookie; +import org.openide.filesystems.FileObject; +import org.openide.filesystems.FileUtil; +import org.openide.loaders.DataObject; +import static org.junit.Assert.*; + +/** Shows how o.n.core uses the SelfSamplerAction to start and stop self profiling. + * + * @author Jaroslav Tulach + */ +public class SelfSamplerActionTest { + + public SelfSamplerActionTest() { + } + + @Test + public void testSelfProfileToStream() throws Exception { + FileObject afo = FileUtil.getConfigFile("Actions/Profile/org-netbeans-modules-profiler-actions-SelfSamplerAction.instance"); + assertNotNull("SelfSamplerAction is in the right fileobject", afo); + Action a = (Action)afo.getAttribute("delegate"); // NOI18N + Object obj = a.getValue("logger-testprofile"); + assertTrue("It is runnable", obj instanceof Runnable); + assertTrue("It is action listener", obj instanceof ActionListener); + + Runnable r = (Runnable)obj; + ActionListener al = (ActionListener)obj; + + r.run(); + Thread.sleep(1000); + assertLoggerThread("logger-testprofile shall be there", true); + + FileObject fo = FileUtil.createMemoryFileSystem().getRoot().createData("slow.nps"); + OutputStream os = fo.getOutputStream(); + DataOutputStream dos = new DataOutputStream(os); + al.actionPerformed(new ActionEvent(dos, 0, "write")); // NOI18N + dos.close(); + + if (fo.getSize() < 100) { + fail("The file shall have real content: " + fo.getSize()); + } + + DataObject dataObject = DataObject.find(fo); + assertEquals("Nps DataObject", NpsDataObject.class, dataObject.getClass()); + OpenCookie oc = dataObject.getLookup().lookup(OpenCookie.class); + assertNotNull("Open cookie exists", oc); + + CharSequence log = Log.enable("", Level.WARNING); + oc.open(); + + if (log.length() > 0) { + fail("There shall be no warnings:\n" + log); + } + + assertLoggerThread("no logger- thread shall be there", false); + } + + @Test + public void testSelfProfileCancel() throws Exception { + SelfSamplerAction result = SelfSamplerAction.getInstance(); + Object obj = result.getValue("logger-testprofile"); + assertTrue("It is runnable", obj instanceof Runnable); + assertTrue("It is action listener", obj instanceof ActionListener); + + Runnable r = (Runnable)obj; + ActionListener al = (ActionListener)obj; + + r.run(); + Thread.sleep(1000); + assertLoggerThread("logger-testprofile shall be there", true); + + al.actionPerformed(new ActionEvent(this, 0, "cancel")); // NOI18N + + assertLoggerThread("no logger- thread shall be there", false); + } + + private void assertLoggerThread(String msg, boolean exist) { + for (Thread t : Thread.getAllStackTraces().keySet()) { + if (t.getName().startsWith("logger-")) { + assertTrue(msg + "There is " + t.getName() + " thread", exist); + return; + } + } + assertFalse(msg + "There is no logger- thread", exist); + } + + +} \ No newline at end of file # HG changeset patch # User Jaroslav Tulach # Date 1243944193 -7200 # Node ID 1658f9c21825c034ea0deba7b3b28a9976efaf16 # Parent 15df29c7d7db10d2c5e7fe19c80198ecd1b1b2bd Adding forgotten icon for #166023: System Slowness Detected Infrastructure diff --git a/o.n.core/src/org/netbeans/core/resources/vilik.png b/o.n.core/src/org/netbeans/core/resources/vilik.png new file mode 100644 index 0000000000000000000000000000000000000000..bacd931f5face49bdb50845a35c1396e88b21af8 GIT binary patch literal 876 zc$@)j1C#uTP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2iXN0 z2oM21cdWAj000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0008VNkl3nvV2lz)9wLg)KrK^gdntX;LT~B4vndhX5dY*PCnx#O`Sa&L5?>$z z^?(7W0z5#B6(BC_e*+T0x*|DKoEre4*js=SzPY-Dr+^>mD=|un4sKBt#Jakw`i_nr zCq+q2b$9RT>FXPN45&*a;af@P&;RP(zf-xAT`=y==b}@?|A>#fkNcZ?d;13iflUqD zxBb2^7>ub!^_t-;Ig%v#{q1*~n;SQpOr?az{;I8X#oN7J^Bbqr(x$4pXd;o3T(0sx z(P(N!*Y)sn53pD)Cb!%DQ+c@)S(Y&vojA%^1-f48l+|c7sh&Q4pkrwG^4~pwwELC} zVqJrMO=rM&RuF_zB^FX6k%+0Kr3K?c3{}$>pFMl8xZO5WXlh37I?{S%{QX4YW^exx zfZ+95>#tq$KW}T>T7{M-mrFA+S_O#^N+^TSEs_^ z*&zVw&vV;;?(7U4M&1sE7zRP1)|Eyqna5mvhMCy~c_I1Ypw*c1RFrA9L%XXz^V!@{ zU!x;FJQ{mxFq_LX#0n@VphW;k&EU}$h8Iv}i+^$qJCCXdV7WwV(Ao@$G4I+9TlgrSkqSkJo;@sBGmScYbx zvY5b9;5ML1-?3mGSPjTP8Ylp%?@_Syd}6UwK>r`!qzkE&Kr99T0000 # Date 1243949612 -7200 # Node ID ef2526558afb84b3c78e44efb7b5f2ae6ee29a76 # Parent 24d72d2643e18ec0d59d99b46637708b0394a57f #166254: Don't create any lastModified info for non-existing clusters. Also reset the result for each cluster to isolate it from the influence on previous results. diff --git a/o.n.bootstrap/src/org/netbeans/Stamps.java b/o.n.bootstrap/src/org/netbeans/Stamps.java --- a/o.n.bootstrap/src/org/netbeans/Stamps.java +++ b/o.n.bootstrap/src/org/netbeans/Stamps.java @@ -91,6 +91,15 @@ stamp(false); return; } + if (args.length == 1 && "init".equals(args[0])) { // NOI18N + moduleJARs = null; + stamp(true); + return; + } + if (args.length == 1 && "clear".equals(args[0])) { // NOI18N + moduleJARs = null; + return; + } } private static final Stamps MODULES_JARS = new Stamps(); /** Creates instance of stamp that checks timestamp for all files that affect @@ -359,35 +368,46 @@ File configDir = new File(new File(cluster, "config"), "Modules"); // NOI18N File modulesDir = new File(cluster, "modules"); // NOI18N - - highestStampForDir(configDir, result); - highestStampForDir(modulesDir, result); + + AtomicLong clusterResult = new AtomicLong(); + if (highestStampForDir(configDir, clusterResult) && highestStampForDir(modulesDir, clusterResult)) { + // ok + } else { + if (!cluster.isDirectory()) { + // skip non-existing clusters` + return; + } + } + + if (clusterResult.longValue() > result.longValue()) { + result.set(clusterResult.longValue()); + } if (createStampFile) { try { stamp.getParentFile().mkdirs(); stamp.createNewFile(); - stamp.setLastModified(result.longValue()); + stamp.setLastModified(clusterResult.longValue()); } catch (IOException ex) { System.err.println("Cannot write timestamp to " + stamp); // NOI18N } } } - private static void highestStampForDir(File file, AtomicLong result) { + private static boolean highestStampForDir(File file, AtomicLong result) { File[] children = file.listFiles(); if (children == null) { long time = file.lastModified(); if (time > result.longValue()) { result.set(time); } - return; + return false; } for (File f : children) { highestStampForDir(f, result); } - + return true; } private static boolean compareAndUpdateFile(File file, String content, AtomicLong result) { diff --git a/o.n.bootstrap/test/unit/src/org/netbeans/StampsExtraTest.java b/o.n.bootstrap/test/unit/src/org/netbeans/StampsExtraTest.java new file mode 100644 --- /dev/null +++ b/o.n.bootstrap/test/unit/src/org/netbeans/StampsExtraTest.java @@ -0,0 +1,137 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2008 Sun Microsystems, Inc. + */ + +package org.netbeans; + +import java.io.File; +import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; +import junit.framework.Test; +import org.netbeans.junit.NbTestCase; +import org.netbeans.junit.NbTestSuite; + +/** + * + * @author Jaroslav Tulach + */ +public class StampsExtraTest extends NbTestCase { + private File userdir; + private File ide; + private File platform; + private File install; + private File extra; + + + public static Test suite() { + //return new StampsTest("testStampsInvalidatedWhenClustersChange"); + return new NbTestSuite(StampsExtraTest.class); + } + + public StampsExtraTest(String testName) { + super(testName); + } + + public void testTimeStampsWhenAddingCluster() throws Exception { + clearWorkDir(); + + install = new File(getWorkDir(), "install"); + platform = new File(install, "platform7"); + platform.mkdirs(); + ide = new File(install, "ide8"); + ide.mkdirs(); + extra = new File(install, "extra"); + userdir = new File(getWorkDir(), "tmp"); + userdir.mkdirs(); + + System.setProperty("netbeans.home", platform.getPath()); + System.setProperty("netbeans.dirs", ide.getPath() + File.pathSeparator + extra.getPath()); + System.setProperty("netbeans.user", userdir.getPath()); + + touch(platform, ".lastModified", 50000L); + touch(ide, ".lastModified", 90000L); + assertFalse("One cluster does not exists", extra.isDirectory()); + + Stamps.main("init"); + + Thread.sleep(100); + + Logger l = Logger.getLogger("org"); + l.setLevel(Level.OFF); + l.setUseParentHandlers(false); + + long stamp = Stamps.moduleJARs(); + assertEquals("Timestamp is taken from api.languages module", 90000L, stamp); + + Stamps.main("clear"); + + CountingSecurityManager.initialize(install.getPath()); + + long newStamp = Stamps.moduleJARs(); + + CountingSecurityManager.assertCounts("Just few accesses to installation", 6); + assertEquals("Stamps are the same", stamp, newStamp); + + File lastModifiedDir = new File(new File(new File(userdir, "var"), "cache"), "lastModified"); + File extraLM = new File(lastModifiedDir, "extra"); + assertFalse("File has not been created for non-existing cluster", extraLM.canRead()); + + extra.mkdirs(); + File lastModified = new File(extra, ".lastModified"); + lastModified.createNewFile(); + lastModified.setLastModified(200000L); + assertEquals("Correct last modified", 200000L, lastModified.lastModified()); + + Stamps.main("clear"); + stamp = Stamps.moduleJARs(); + if (stamp < 200000L) { + fail("lastModified has not been updated: " + stamp); + } + } + + private static void touch(File root, String rel, long time) throws IOException { + File f = new File(root, rel.replace('/', File.separatorChar)); + if (!f.exists()) { + f.getParentFile().mkdirs(); + f.createNewFile(); + } + f.setLastModified(time); + assertEquals("Correct last modified for " + f, time, f.lastModified()); + } +} diff --git a/o.n.bootstrap/test/unit/src/org/netbeans/StampsIdeLessThanPlatformTest.java b/o.n.bootstrap/test/unit/src/org/netbeans/StampsIdeLessThanPlatformTest.java new file mode 100644 --- /dev/null +++ b/o.n.bootstrap/test/unit/src/org/netbeans/StampsIdeLessThanPlatformTest.java @@ -0,0 +1,111 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2008 Sun Microsystems, Inc. + */ + +package org.netbeans; + +import java.io.File; +import java.util.logging.Level; +import java.util.logging.Logger; +import junit.framework.Test; +import org.netbeans.junit.NbTestCase; +import org.netbeans.junit.NbTestSuite; + +/** + * + * @author Jaroslav Tulach + */ +public class StampsIdeLessThanPlatformTest extends NbTestCase { + private File userdir; + private File ide; + private File platform; + private File install; + + + public static Test suite() { + //return new StampsTest("testStampsInvalidatedWhenClustersChange"); + return new NbTestSuite(StampsIdeLessThanPlatformTest.class); + } + + public StampsIdeLessThanPlatformTest(String testName) { + super(testName); + } + + @Override + protected void setUp() throws Exception { + clearWorkDir(); + + install = new File(getWorkDir(), "install"); + platform = new File(install, "platform7"); + ide = new File(install, "ide8"); + userdir = new File(getWorkDir(), "tmp"); + + System.setProperty("netbeans.home", platform.getPath()); + System.setProperty("netbeans.dirs", ide.getPath()); + System.setProperty("netbeans.user", userdir.getPath()); + + StampsTest.createModule("org.openide.awt", platform, 50000L); + StampsTest.createModule("org.openide.nodes", platform, 60000L); + StampsTest.createModule("org.netbeans.api.languages", ide, 50000L); + StampsTest.createModule("org.netbeans.modules.logmanagement", userdir, 10000L); + + Stamps.main("reset"); + + Thread.sleep(100); + + Logger l = Logger.getLogger("org"); + l.setLevel(Level.OFF); + l.setUseParentHandlers(false); + } + + @Override + protected void tearDown() throws Exception { + super.tearDown(); + } + + public void testGenerateTimeStamps() { + long stamp = Stamps.moduleJARs(); + assertEquals("Timestamp is taken from nodes module", 60000L, stamp); + + StampsTest.assertStamp(60000L, platform, false, true); + StampsTest.assertStamp(50000L, ide, false, true); + StampsTest.assertStamp(-1L, userdir, false, false); + } + + +} diff --git a/o.n.bootstrap/test/unit/src/org/netbeans/StampsTest.java b/o.n.bootstrap/test/unit/src/org/netbeans/StampsTest.java --- a/o.n.bootstrap/test/unit/src/org/netbeans/StampsTest.java +++ b/o.n.bootstrap/test/unit/src/org/netbeans/StampsTest.java @@ -45,7 +45,6 @@ import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.MappedByteBuffer; -import java.util.LinkedList; import java.util.concurrent.Semaphore; import java.util.logging.Level; import java.util.logging.Logger; @@ -340,6 +339,11 @@ boolean called; public void flushCaches(DataOutputStream os) throws IOException { + for (int i = 0; i < 1024 * 1024; i++) { + os.write(10); + } + os.flush(); + os.close(); throw new IOException("Not supported yet."); } @@ -553,9 +557,9 @@ } } } - - - private static void assertStamp(long expectedValue, File cluster, boolean global, boolean local) { + + + static void assertStamp(long expectedValue, File cluster, boolean global, boolean local) { File globalStamp = new File(cluster, ".lastModified"); File userDir = new File(System.getProperty("netbeans.user")); @@ -577,7 +581,7 @@ } - private void createModule(String cnb, File cluster, long accesTime) throws IOException { + static void createModule(String cnb, File cluster, long accesTime) throws IOException { String dashes = cnb.replace('.', '-'); File config = new File(new File(new File(cluster, "config"), "Modules"), dashes + ".xml"); # HG changeset patch # User Jaroslav Tulach # Date 1243949876 -7200 # Node ID 8896fe8d691be430ea98a32d1a2b72323467f02b # Parent 1658f9c21825c034ea0deba7b3b28a9976efaf16 # Parent ef2526558afb84b3c78e44efb7b5f2ae6ee29a76 Merge of #166254 diff --git a/o.n.bootstrap/src/org/netbeans/Stamps.java b/o.n.bootstrap/src/org/netbeans/Stamps.java --- a/o.n.bootstrap/src/org/netbeans/Stamps.java +++ b/o.n.bootstrap/src/org/netbeans/Stamps.java @@ -91,6 +91,15 @@ stamp(false); return; } + if (args.length == 1 && "init".equals(args[0])) { // NOI18N + moduleJARs = null; + stamp(true); + return; + } + if (args.length == 1 && "clear".equals(args[0])) { // NOI18N + moduleJARs = null; + return; + } } private static final Stamps MODULES_JARS = new Stamps(); /** Creates instance of stamp that checks timestamp for all files that affect @@ -359,35 +368,46 @@ File configDir = new File(new File(cluster, "config"), "Modules"); // NOI18N File modulesDir = new File(cluster, "modules"); // NOI18N - - highestStampForDir(configDir, result); - highestStampForDir(modulesDir, result); + + AtomicLong clusterResult = new AtomicLong(); + if (highestStampForDir(configDir, clusterResult) && highestStampForDir(modulesDir, clusterResult)) { + // ok + } else { + if (!cluster.isDirectory()) { + // skip non-existing clusters` + return; + } + } + + if (clusterResult.longValue() > result.longValue()) { + result.set(clusterResult.longValue()); + } if (createStampFile) { try { stamp.getParentFile().mkdirs(); stamp.createNewFile(); - stamp.setLastModified(result.longValue()); + stamp.setLastModified(clusterResult.longValue()); } catch (IOException ex) { System.err.println("Cannot write timestamp to " + stamp); // NOI18N } } } - private static void highestStampForDir(File file, AtomicLong result) { + private static boolean highestStampForDir(File file, AtomicLong result) { File[] children = file.listFiles(); if (children == null) { long time = file.lastModified(); if (time > result.longValue()) { result.set(time); } - return; + return false; } for (File f : children) { highestStampForDir(f, result); } - + return true; } private static boolean compareAndUpdateFile(File file, String content, AtomicLong result) { diff --git a/o.n.bootstrap/test/unit/src/org/netbeans/StampsExtraTest.java b/o.n.bootstrap/test/unit/src/org/netbeans/StampsExtraTest.java new file mode 100644 --- /dev/null +++ b/o.n.bootstrap/test/unit/src/org/netbeans/StampsExtraTest.java @@ -0,0 +1,137 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2008 Sun Microsystems, Inc. + */ + +package org.netbeans; + +import java.io.File; +import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; +import junit.framework.Test; +import org.netbeans.junit.NbTestCase; +import org.netbeans.junit.NbTestSuite; + +/** + * + * @author Jaroslav Tulach + */ +public class StampsExtraTest extends NbTestCase { + private File userdir; + private File ide; + private File platform; + private File install; + private File extra; + + + public static Test suite() { + //return new StampsTest("testStampsInvalidatedWhenClustersChange"); + return new NbTestSuite(StampsExtraTest.class); + } + + public StampsExtraTest(String testName) { + super(testName); + } + + public void testTimeStampsWhenAddingCluster() throws Exception { + clearWorkDir(); + + install = new File(getWorkDir(), "install"); + platform = new File(install, "platform7"); + platform.mkdirs(); + ide = new File(install, "ide8"); + ide.mkdirs(); + extra = new File(install, "extra"); + userdir = new File(getWorkDir(), "tmp"); + userdir.mkdirs(); + + System.setProperty("netbeans.home", platform.getPath()); + System.setProperty("netbeans.dirs", ide.getPath() + File.pathSeparator + extra.getPath()); + System.setProperty("netbeans.user", userdir.getPath()); + + touch(platform, ".lastModified", 50000L); + touch(ide, ".lastModified", 90000L); + assertFalse("One cluster does not exists", extra.isDirectory()); + + Stamps.main("init"); + + Thread.sleep(100); + + Logger l = Logger.getLogger("org"); + l.setLevel(Level.OFF); + l.setUseParentHandlers(false); + + long stamp = Stamps.moduleJARs(); + assertEquals("Timestamp is taken from api.languages module", 90000L, stamp); + + Stamps.main("clear"); + + CountingSecurityManager.initialize(install.getPath()); + + long newStamp = Stamps.moduleJARs(); + + CountingSecurityManager.assertCounts("Just few accesses to installation", 6); + assertEquals("Stamps are the same", stamp, newStamp); + + File lastModifiedDir = new File(new File(new File(userdir, "var"), "cache"), "lastModified"); + File extraLM = new File(lastModifiedDir, "extra"); + assertFalse("File has not been created for non-existing cluster", extraLM.canRead()); + + extra.mkdirs(); + File lastModified = new File(extra, ".lastModified"); + lastModified.createNewFile(); + lastModified.setLastModified(200000L); + assertEquals("Correct last modified", 200000L, lastModified.lastModified()); + + Stamps.main("clear"); + stamp = Stamps.moduleJARs(); + if (stamp < 200000L) { + fail("lastModified has not been updated: " + stamp); + } + } + + private static void touch(File root, String rel, long time) throws IOException { + File f = new File(root, rel.replace('/', File.separatorChar)); + if (!f.exists()) { + f.getParentFile().mkdirs(); + f.createNewFile(); + } + f.setLastModified(time); + assertEquals("Correct last modified for " + f, time, f.lastModified()); + } +} diff --git a/o.n.bootstrap/test/unit/src/org/netbeans/StampsIdeLessThanPlatformTest.java b/o.n.bootstrap/test/unit/src/org/netbeans/StampsIdeLessThanPlatformTest.java new file mode 100644 --- /dev/null +++ b/o.n.bootstrap/test/unit/src/org/netbeans/StampsIdeLessThanPlatformTest.java @@ -0,0 +1,111 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2008 Sun Microsystems, Inc. + */ + +package org.netbeans; + +import java.io.File; +import java.util.logging.Level; +import java.util.logging.Logger; +import junit.framework.Test; +import org.netbeans.junit.NbTestCase; +import org.netbeans.junit.NbTestSuite; + +/** + * + * @author Jaroslav Tulach + */ +public class StampsIdeLessThanPlatformTest extends NbTestCase { + private File userdir; + private File ide; + private File platform; + private File install; + + + public static Test suite() { + //return new StampsTest("testStampsInvalidatedWhenClustersChange"); + return new NbTestSuite(StampsIdeLessThanPlatformTest.class); + } + + public StampsIdeLessThanPlatformTest(String testName) { + super(testName); + } + + @Override + protected void setUp() throws Exception { + clearWorkDir(); + + install = new File(getWorkDir(), "install"); + platform = new File(install, "platform7"); + ide = new File(install, "ide8"); + userdir = new File(getWorkDir(), "tmp"); + + System.setProperty("netbeans.home", platform.getPath()); + System.setProperty("netbeans.dirs", ide.getPath()); + System.setProperty("netbeans.user", userdir.getPath()); + + StampsTest.createModule("org.openide.awt", platform, 50000L); + StampsTest.createModule("org.openide.nodes", platform, 60000L); + StampsTest.createModule("org.netbeans.api.languages", ide, 50000L); + StampsTest.createModule("org.netbeans.modules.logmanagement", userdir, 10000L); + + Stamps.main("reset"); + + Thread.sleep(100); + + Logger l = Logger.getLogger("org"); + l.setLevel(Level.OFF); + l.setUseParentHandlers(false); + } + + @Override + protected void tearDown() throws Exception { + super.tearDown(); + } + + public void testGenerateTimeStamps() { + long stamp = Stamps.moduleJARs(); + assertEquals("Timestamp is taken from nodes module", 60000L, stamp); + + StampsTest.assertStamp(60000L, platform, false, true); + StampsTest.assertStamp(50000L, ide, false, true); + StampsTest.assertStamp(-1L, userdir, false, false); + } + + +} diff --git a/o.n.bootstrap/test/unit/src/org/netbeans/StampsTest.java b/o.n.bootstrap/test/unit/src/org/netbeans/StampsTest.java --- a/o.n.bootstrap/test/unit/src/org/netbeans/StampsTest.java +++ b/o.n.bootstrap/test/unit/src/org/netbeans/StampsTest.java @@ -45,7 +45,6 @@ import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.MappedByteBuffer; -import java.util.LinkedList; import java.util.concurrent.Semaphore; import java.util.logging.Level; import java.util.logging.Logger; @@ -558,9 +557,9 @@ } } } - - - private static void assertStamp(long expectedValue, File cluster, boolean global, boolean local) { + + + static void assertStamp(long expectedValue, File cluster, boolean global, boolean local) { File globalStamp = new File(cluster, ".lastModified"); File userDir = new File(System.getProperty("netbeans.user")); @@ -582,7 +581,7 @@ } - private void createModule(String cnb, File cluster, long accesTime) throws IOException { + static void createModule(String cnb, File cluster, long accesTime) throws IOException { String dashes = cnb.replace('.', '-'); File config = new File(new File(new File(cluster, "config"), "Modules"), dashes + ".xml"); # HG changeset patch # User ffjre@netbeans.org # Date 1243954465 -14400 # Node ID 9ddc24971ea357edfa50e7ab9b9da45bb1c83628 # Parent 8896fe8d691be430ea98a32d1a2b72323467f02b # Parent aaca11262fd4e0a3220f0f188ff8baac59c007bf Automated merge with http://hg.netbeans.org/ergonomics diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java --- a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java @@ -75,6 +75,7 @@ super(name); System.setProperty("org.netbeans.modules.cnd.makeproject.api.runprofiles", "true"); // NOI18N System.setProperty("cnd.mode.unittest", "true"); + System.setProperty("cnd.make.project.creation.skip.notify.header.extension", "true"); Logger.getLogger("org.netbeans.modules.editor.settings.storage.Utils").setLevel(Level.SEVERE); } @@ -245,10 +246,13 @@ fileCreatedFolder.mkdirs(); } if (fileCreatedFolder.list().length == 0){ + System.err.println(dataPath+"#wget "+urlName); ne = new NativeExecutor(dataPath,"wget", urlName, new String[0], "wget", "run", false, false); waitExecution(ne, listener, finish); + System.err.println(dataPath+"#gzip -d "+zipName); ne = new NativeExecutor(dataPath,"gzip", "-d "+zipName, new String[0], "gzip", "run", false, false); waitExecution(ne, listener, finish); + System.err.println(dataPath+"#tar xf "+tarName); ne = new NativeExecutor(dataPath,"tar", "xf "+tarName, new String[0], "tar", "run", false, false); waitExecution(ne, listener, finish); if (additionalScripts != null) { @@ -256,11 +260,16 @@ int i = s.indexOf(' '); String command = s.substring(0,i); String arguments = s.substring(i+1); - ne = new NativeExecutor(dataPath,command, arguments, new String[0], command, "run", false, false); + if (command.startsWith(".")) { + command = createdFolder+"/"+command; + } + System.err.println(createdFolder+"#"+command+" "+arguments); + ne = new NativeExecutor(createdFolder, command, arguments, new String[0], command, "run", false, false); waitExecution(ne, listener, finish); } } } + System.err.println(createdFolder+"#rm -rf nbproject"); ne = new NativeExecutor(createdFolder, "rm", "-rf nbproject", new String[0], "rm", "run", false, false); waitExecution(ne, listener, finish); return createdFolder; diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTest.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTest.java new file mode 100644 --- /dev/null +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTest.java @@ -0,0 +1,87 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.cnd.discovery.project; + +import java.util.ArrayList; +import java.util.List; +import org.netbeans.modules.cnd.api.model.CsmFile; +import org.netbeans.modules.cnd.api.model.CsmInclude; +import org.netbeans.modules.cnd.api.model.CsmProject; + +/** + * + * @author Alexander Simon + */ +public class MysqlConnectorTest extends MakeProjectBase { + private static final boolean TRACE = true; + + public MysqlConnectorTest() { + super("MysqlConnectorTest"); + if (TRACE) { + System.setProperty("cnd.discovery.trace.projectimport", "true"); // NOI18N + } + + } + + public void testCmake(){ + performTestProject("http://www.cmake.org/files/v2.6/cmake-2.6.4.tar.gz", null); + } + + public void testMysqlConnector(){ + List list = new ArrayList(); + list.add("../cmake-2.6.4/bin/cmake -G \"Unix Makefiles\" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS=\"-g3 -gdwarf-2\" -DCMAKE_C_FLAGS=\"-g3 -gdwarf-2\""); + performTestProject("http://download.softagency.net/MySQL/Downloads/Connector-C/mysql-connector-c-6.0.1.tar.gz", list); + } + + @Override + void perform(CsmProject csmProject) { + if (TRACE) { + System.err.println("Model content:"); + } + for (CsmFile file : csmProject.getAllFiles()) { + if (TRACE) { + System.err.println("\t"+file.getAbsolutePath()); + } + for(CsmInclude include : file.getIncludes()){ + assertTrue("Not resolved include directive "+include.getIncludeName()+" in file "+file.getAbsolutePath(), include.getIncludeFile() != null); + } + } + } +} diff --git a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/MakeProject.java b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/MakeProject.java --- a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/MakeProject.java +++ b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/MakeProject.java @@ -133,6 +133,7 @@ public final class MakeProject implements Project, AntProjectListener { public static final boolean TRACE_MAKE_PROJECT_CREATION = Boolean.getBoolean("cnd.make.project.creation.trace"); // NOI18N + public static final boolean SKIP_NOTIFY_NEW_HEADER_EXTENSION = Boolean.getBoolean("cnd.make.project.creation.skip.notify.header.extension"); // NOI18N // private static final Icon MAKE_PROJECT_ICON = new ImageIcon(ImageUtilities.loadImage("org/netbeans/modules/cnd/makeproject/ui/resources/makeProject.gif")); // NOI18N private static final String HEADER_EXTENSIONS = "header-extensions"; // NOI18N @@ -407,6 +408,9 @@ } extensions.append(ext); } + if (SKIP_NOTIFY_NEW_HEADER_EXTENSION){ + return true; + } NotifyDescriptor d = new NotifyDescriptor.Confirmation( MessageFormat.format(message, new Object[]{extensions.toString()}), getString("ADD_EXTENSION_DIALOG_TITLE" + type + (usedExtension.size() == 1 ? "" : "S")), // NOI18N diff --git a/j2ee.metadata.model.support/src/org/netbeans/modules/j2ee/metadata/model/api/support/annotation/AnnotationModelHelper.java b/j2ee.metadata.model.support/src/org/netbeans/modules/j2ee/metadata/model/api/support/annotation/AnnotationModelHelper.java --- a/j2ee.metadata.model.support/src/org/netbeans/modules/j2ee/metadata/model/api/support/annotation/AnnotationModelHelper.java +++ b/j2ee.metadata.model.support/src/org/netbeans/modules/j2ee/metadata/model/api/support/annotation/AnnotationModelHelper.java @@ -234,16 +234,21 @@ * (should be guaranteed by JavaSource.javacLock). */ private V runCallable(Callable callable, CompilationController controller, boolean notify) throws IOException { + JavaSource oldJavaSource; + Thread oldUserActionTaskThread; synchronized (AnnotationModelHelper.this) { if (userActionTaskThread != null && userActionTaskThread != Thread.currentThread()) { throw new IllegalStateException("JavaSource.runUserActionTask() should not be executed by multiple threads concurrently"); // NOI18N } + oldUserActionTaskThread = userActionTaskThread; userActionTaskThread = Thread.currentThread(); - AnnotationModelHelper.this.javaSource = controller.getJavaSource(); + oldJavaSource = javaSource; + javaSource = controller.getJavaSource(); } + CompilationController oldController = AnnotationModelHelper.this.controller; AnnotationModelHelper.this.controller = controller; - controller.toPhase(Phase.ELEMENTS_RESOLVED); try { + controller.toPhase(Phase.ELEMENTS_RESOLVED); return callable.call(); } catch (Exception e) { if (e instanceof RuntimeException) { @@ -252,11 +257,11 @@ throw new MetadataModelException(e); } } finally { - AnnotationModelHelper.this.controller = null; + AnnotationModelHelper.this.controller = oldController; annotationScanner = null; synchronized (AnnotationModelHelper.this) { - javaSource = null; - userActionTaskThread = null; + javaSource = oldJavaSource; + userActionTaskThread = oldUserActionTaskThread; } if (notify) { // have to notify while still under the javac lock diff --git a/nbi/engine/src/org/netbeans/installer/utils/system/launchers/Bundle.properties b/nbi/engine/src/org/netbeans/installer/utils/system/launchers/Bundle.properties --- a/nbi/engine/src/org/netbeans/installer/utils/system/launchers/Bundle.properties +++ b/nbi/engine/src/org/netbeans/installer/utils/system/launchers/Bundle.properties @@ -35,6 +35,6 @@ # LP.error.cannot.load.bundle=Can`t load bundle from {0} -LP.error.no.files=There is no files in {0) +LP.error.no.files=There is no files in {0} LP.error.not.directory={0} is not a directory LP.error.directory.do.not.exist=Directory {0} does not exist diff --git a/o.n.bootstrap/src/org/netbeans/CLIHandler.java b/o.n.bootstrap/src/org/netbeans/CLIHandler.java --- a/o.n.bootstrap/src/org/netbeans/CLIHandler.java +++ b/o.n.bootstrap/src/org/netbeans/CLIHandler.java @@ -742,7 +742,7 @@ case -1: enterState(48, block); // EOF. Why does this happen? - break; + break COMMUNICATION; default: enterState(49, block); assert false : reply; diff --git a/php.project/src/org/netbeans/modules/php/project/ui/actions/DownloadCommand.java b/php.project/src/org/netbeans/modules/php/project/ui/actions/DownloadCommand.java --- a/php.project/src/org/netbeans/modules/php/project/ui/actions/DownloadCommand.java +++ b/php.project/src/org/netbeans/modules/php/project/ui/actions/DownloadCommand.java @@ -113,14 +113,11 @@ try { progressHandle.start(); Set forDownload = remoteClient.prepareDownload(sources, filesToDownload); - // avoid timeout errors - remoteClient.disconnect(); if (showDownloadDialog) { + // avoid timeout errors + remoteClient.disconnect(); forDownload = TransferFilter.showDownloadDialog(forDownload); - if (forDownload.size() == 0) { - return; - } } if (forDownload.size() > 0) { # HG changeset patch # User Jaroslav Tulach # Date 1243969364 -7200 # Node ID 3f6104a0253e0279680fe65442f8d770703e28b2 # Parent 9ddc24971ea357edfa50e7ab9b9da45bb1c83628 Adopting the test to new style of reporting diff --git a/o.n.core/test/unit/src/org/netbeans/core/TimableEventQueueTest.java b/o.n.core/test/unit/src/org/netbeans/core/TimableEventQueueTest.java --- a/o.n.core/test/unit/src/org/netbeans/core/TimableEventQueueTest.java +++ b/o.n.core/test/unit/src/org/netbeans/core/TimableEventQueueTest.java @@ -101,19 +101,10 @@ EventQueue.invokeAndWait(slow); assertEquals("called", 2, slow.ok); - - assertEquals("Only One report:" + handler.records, 1, handler.records.size()); - LogRecord r = handler.records.get(0); - - assertNotNull("Exception present", r.getThrown()); - if (r.getThrown().getMessage().indexOf("Slow") == -1) { - fail("There should be stacktrace from slow:\n" + r.getThrown().getMessage()); + + if (handler.records.isEmpty()) { + fail("There shall be some reports: " + handler.records); } - boolean found = false; - for (StackTraceElement stackTraceElement : r.getThrown().getStackTrace()) { - found = found || stackTraceElement.getClassName().indexOf("Slow") >= 0; - } - assertTrue("Slow is in the stack trace", found); } private static final class CountingHandler extends Handler { # HG changeset patch # User Jaroslav Tulach # Date 1243969555 -7200 # Node ID ad72af96785e35d3c219bd0dc869a04d4eef9d10 # Parent 3f6104a0253e0279680fe65442f8d770703e28b2 Disable system slowness detection during the blacklisting test diff --git a/ide.kit/test/qa-functional/src/org/netbeans/test/ide/GeneralSanityTest.java b/ide.kit/test/qa-functional/src/org/netbeans/test/ide/GeneralSanityTest.java --- a/ide.kit/test/qa-functional/src/org/netbeans/test/ide/GeneralSanityTest.java +++ b/ide.kit/test/qa-functional/src/org/netbeans/test/ide/GeneralSanityTest.java @@ -73,6 +73,8 @@ } public static Test suite() { + // disable 'slowness detection' + System.setProperty("org.netbeans.core.TimeableEventQueue.quantum", "100000"); NbTestSuite s = new NbTestSuite(); s.addTest(new GeneralSanityTest("testInitBlacklistedClassesHandler")); s.addTest(NbModuleSuite.create( # HG changeset patch # User ffjre@netbeans.org # Date 1243975732 -14400 # Node ID f24c98f0d4f6956722565940e647f3b3965b6e52 # Parent ad72af96785e35d3c219bd0dc869a04d4eef9d10 # Parent d9ea8b21141ec11056740664ec6b41a0221a589b Automated merge with http://hg.netbeans.org/ergonomics diff --git a/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTDefineNode.java b/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTDefineNode.java --- a/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTDefineNode.java +++ b/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTDefineNode.java @@ -275,10 +275,10 @@ return false; } final APTDefineNode other = (APTDefineNode) obj; - if (this.params != other.params && (this.params == null || !this.params.equals(other.params))) { + if (!APTUtils.equalArrayLists(this.params, other.params)) { return false; } - if (this.bodyTokens != other.bodyTokens && (this.bodyTokens == null || !this.bodyTokens.equals(other.bodyTokens))) { + if (!APTUtils.equalArrayLists(this.bodyTokens, other.bodyTokens)) { return false; } return true; diff --git a/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTUtils.java b/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTUtils.java --- a/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTUtils.java +++ b/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTUtils.java @@ -108,6 +108,28 @@ return h ^ (h >>> 16); } + public static boolean equalArrayLists(List l1, List l2) { + if (l1 != l2) { + if (l1 == null || l2 == null) { + return false; + } else { + int n1 = l1.size(); + int n2 = l2.size(); + if (n1 != n2) { + return false; + } + for (int i = 0; i < n1; i++) { + if (!l1.get(i).equals(l2.get(i))) { + return false; + } + } + return true; + } + } else { + return true; + } + } + public static void setTokenText(APTToken _token, char buf[], int start, int count) { if (_token instanceof APTBaseToken) { _token.setTextID(CharSequenceKey.create(buf, start, count)); diff --git a/cnd.gizmo/src/org/netbeans/modules/cnd/gizmo/CodeModelSourceFileInfoProvider.java b/cnd.gizmo/src/org/netbeans/modules/cnd/gizmo/CodeModelSourceFileInfoProvider.java --- a/cnd.gizmo/src/org/netbeans/modules/cnd/gizmo/CodeModelSourceFileInfoProvider.java +++ b/cnd.gizmo/src/org/netbeans/modules/cnd/gizmo/CodeModelSourceFileInfoProvider.java @@ -61,7 +61,7 @@ @ServiceProvider(service = SourceFileInfoProvider.class) public final class CodeModelSourceFileInfoProvider implements SourceFileInfoProvider { - public SourceFileInfo fileName(String functionName, long offset, Map serviceInfo) { + public SourceFileInfo fileName(String functionName, int lineNumber, long offset, Map serviceInfo) { try { //get project current name String projectFolderName = serviceInfo.get(GizmoServiceInfo.GIZMO_PROJECT_FOLDER); @@ -83,6 +83,9 @@ } String sourceFile = function.getContainingFile().getAbsolutePath().toString(); int startOffset = function.getStartOffset(); + if (lineNumber > 0){ + return new SourceFileInfo(sourceFile, lineNumber, 0); + } return new SourceFileInfo(sourceFile, startOffset);//) + offset); // CsmDeclaration csmDeclaration = csmProject.findDeclaration(functionName); // if (csmDeclaration == null) { diff --git a/cnd.gizmo/src/org/netbeans/modules/cnd/gizmo/DwarfSourceInfoProvider.java b/cnd.gizmo/src/org/netbeans/modules/cnd/gizmo/DwarfSourceInfoProvider.java --- a/cnd.gizmo/src/org/netbeans/modules/cnd/gizmo/DwarfSourceInfoProvider.java +++ b/cnd.gizmo/src/org/netbeans/modules/cnd/gizmo/DwarfSourceInfoProvider.java @@ -65,13 +65,13 @@ cache = new WeakHashMap>(); } - public SourceFileInfo fileName(String functionName, long offset, Map serviceInfo) { + public SourceFileInfo fileName(String functionName, int lineNumber, long offset, Map serviceInfo) { if (serviceInfo == null){ return null; } String executable = serviceInfo.get(GizmoServiceInfo.GIZMO_PROJECT_EXECUTABLE); if (executable != null) { - Map sourceInfoMap = getSourceInfo(executable, serviceInfo); + Map sourceInfoMap = getSourceInfo(executable, lineNumber, serviceInfo); SourceFileInfo sourceInfo = sourceInfoMap.get(functionName); if (sourceInfo != null) { return sourceInfo; @@ -97,7 +97,7 @@ return null; } - private synchronized Map getSourceInfo(String executable, Map serviceInfo) { + private synchronized Map getSourceInfo(String executable, int lineNumber, Map serviceInfo) { Map sourceInfoMap = cache.get(executable); if (sourceInfoMap == null) { sourceInfoMap = new HashMap(); @@ -109,7 +109,7 @@ if (entry.getKind().equals(TAG.DW_TAG_subprogram)) { SourceFileInfo sourceInfo = new SourceFileInfo( toAbsolutePath(serviceInfo, entry.getDeclarationFilePath()), - entry.getLine(), 0); + lineNumber > 0 ? lineNumber : entry.getLine(), 0); sourceInfoMap.put(entry.getQualifiedName(), sourceInfo); } } diff --git a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/ProjectActionSupport.java b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/ProjectActionSupport.java --- a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/ProjectActionSupport.java +++ b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/ProjectActionSupport.java @@ -43,6 +43,7 @@ import java.awt.event.ActionEvent; import java.io.File; import java.io.IOException; +import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; import javax.swing.AbstractAction; @@ -360,7 +361,15 @@ } } if (success) { - RemoteSyncWorker syncWorker = ServerList.get(env).getSyncFactory().createNew(new File(baseDir), env, null, null); + PrintWriter err = null; + PrintWriter out = null; + InputOutput tab = getTab(); + if (tab != null) { + out = this.ioTab.getOut(); + err = this.ioTab.getErr(); + } + RemoteSyncWorker syncWorker = ServerList.get(env).getSyncFactory().createNew( + new File(baseDir), env, out, err); success &= syncWorker.synchronize(); } } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/FunctionImplEx.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/FunctionImplEx.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/FunctionImplEx.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/FunctionImplEx.java @@ -209,7 +209,7 @@ FileImpl aFile = (FileImpl) getContainingFile(); VariableDefinitionImpl var = new VariableDefinitionImpl(fixFakeRegistrationAst, getContainingFile(), getReturnType(), getName().toString()); aFile.getProjectImpl(true).unregisterDeclaration(this); - RepositoryUtils.remove(getUID()); + RepositoryUtils.remove(getUID(), this); aFile.getProjectImpl(true).registerDeclaration(var); aFile.addDeclaration(var); fixFakeRegistrationAst = null; @@ -227,7 +227,7 @@ FileImpl aFile = (FileImpl) getContainingFile(); VariableDefinitionImpl var = new VariableDefinitionImpl(fixFakeRegistrationAst, getContainingFile(), getReturnType(), getName().toString()); aFile.getProjectImpl(true).unregisterDeclaration(this); - RepositoryUtils.remove(getUID()); + RepositoryUtils.remove(getUID(), this); aFile.getProjectImpl(true).registerDeclaration(var); aFile.addDeclaration(var); fixFakeRegistrationAst = null; @@ -241,7 +241,7 @@ FunctionImpl fi = new FunctionImpl(fixFakeRegistrationAst, getContainingFile(), this.getScope(), true, true); fixFakeRegistrationAst = null; aFile.getProjectImpl(true).unregisterDeclaration(this); - RepositoryUtils.remove(getUID()); + RepositoryUtils.remove(getUID(), this); aFile.addDeclaration(fi); fixed = true; if (NamespaceImpl.isNamespaceScope(fi)) { diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/NamespaceDefinitionImpl.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/NamespaceDefinitionImpl.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/NamespaceDefinitionImpl.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/NamespaceDefinitionImpl.java @@ -183,7 +183,7 @@ CsmUID uid = UIDCsmConverter.declarationToUID(declaration); assert uid != null; declarations.remove(uid); - RepositoryUtils.remove(uid); + RepositoryUtils.remove(uid, declaration); // update repository RepositoryUtils.put(this); } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/NamespaceImpl.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/NamespaceImpl.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/NamespaceImpl.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/NamespaceImpl.java @@ -455,7 +455,7 @@ getDeclarationsSorage().removeDeclaration(declaration); } // do not clean repository, it must be done from physical container of declaration - if (false) { RepositoryUtils.remove(declarationUid); } + if (false) { RepositoryUtils.remove(declarationUid, declaration); } // update repository RepositoryUtils.put(this); notify(declaration, NotifyEvent.DECLARATION_REMOVED); @@ -532,7 +532,7 @@ nsDefinitionsLock.writeLock().unlock(); } // does not remove unregistered declaration from repository, it's responsibility of physical container - if (false) { RepositoryUtils.remove(definitionUid); } + if (false) { RepositoryUtils.remove(definitionUid, def); } // update repository about itself RepositoryUtils.put(this); if (remove) { diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/FileContainer.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/FileContainer.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/FileContainer.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/FileContainer.java @@ -165,7 +165,7 @@ if (f != null) { if (f.fileNew != null){ // clean repository - if (false) { RepositoryUtils.remove(f.fileNew) ;} + if (false) { RepositoryUtils.remove(f.fileNew, null) ;} } } put(); diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/FileImpl.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/FileImpl.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/FileImpl.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/FileImpl.java @@ -680,6 +680,7 @@ } private void onDispose() { + RepositoryUtils.disposeUID(uid, this); projectLock.writeLock().lock(); try { if (projectRef == null) { @@ -1574,7 +1575,7 @@ } finally { declarationsLock.writeLock().unlock(); } - RepositoryUtils.remove(uidDecl); + RepositoryUtils.remove(uidDecl, declaration); // update repository RepositoryUtils.put(this); } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/LibraryManager.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/LibraryManager.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/LibraryManager.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/LibraryManager.java @@ -82,6 +82,10 @@ private final Map librariesEntries = new ConcurrentHashMap(); private final Object lock = new Object(); + public void shutdown(){ + librariesEntries.clear(); + } + /** * Returns collection of artificial libraries used in project */ diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/ModelImpl.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/ModelImpl.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/ModelImpl.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/ModelImpl.java @@ -443,6 +443,7 @@ for (Iterator projIter = libs.iterator(); projIter.hasNext();) { disposeProject((ProjectBase) projIter.next()); } + LibraryManager.getInstance().shutdown(); cleanCaches(); diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/OffsetableIdentifiableBase.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/OffsetableIdentifiableBase.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/OffsetableIdentifiableBase.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/OffsetableIdentifiableBase.java @@ -47,6 +47,7 @@ import org.netbeans.modules.cnd.api.model.CsmFile; import org.netbeans.modules.cnd.api.model.CsmOffsetable; import org.netbeans.modules.cnd.api.model.CsmUID; +import org.netbeans.modules.cnd.modelimpl.repository.RepositoryUtils; import org.netbeans.modules.cnd.modelimpl.uid.UIDObjectFactory; import org.netbeans.modules.cnd.modelimpl.uid.UIDProviderIml; import org.netbeans.modules.cnd.repository.spi.Persistent; @@ -77,6 +78,12 @@ protected abstract CsmUID createUID(); + @Override + public void dispose() { + RepositoryUtils.disposeUID(uid, this); + super.dispose(); + } + @SuppressWarnings("unchecked") public CsmUID getUID() { if (uid == null) { diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/ProjectBase.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/ProjectBase.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/ProjectBase.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/ProjectBase.java @@ -1962,7 +1962,7 @@ assert key instanceof TinyCharSequence; CsmUID nsUID = namespaces.remove(key); assert nsUID != null; - RepositoryUtils.remove(nsUID); + RepositoryUtils.remove(nsUID, ns); } protected final ModelImpl getModel() { diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/impl/services/FileInfoQueryImpl.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/impl/services/FileInfoQueryImpl.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/impl/services/FileInfoQueryImpl.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/impl/services/FileInfoQueryImpl.java @@ -155,45 +155,6 @@ } else { out = result; } -// try { -// APTFile apt = APTDriver.getInstance().findAPTLight(fileImpl.getBuffer()); -// -// if (hasConditionalsDirectives(apt)) { -// Collection handlers = fileImpl.getPreprocHandlers(); -// if (handlers.isEmpty()) { -// DiagnosticExceptoins.register(new IllegalStateException("Empty preprocessor handlers for " + file.getAbsolutePath())); //NOI18N -// return Collections.emptyList(); -// } else if (handlers.size() == 1) { -// APTPreprocHandler handler = handlers.iterator().next(); -// APTFindUnusedBlocksWalker walker = new APTFindUnusedBlocksWalker(apt, fileImpl, handler, fileImpl.getAPTCacheEntry(handler)); -// walker.visit(); -// out = walker.getBlocks(); -// } else { -// //Comparator comparator = new OffsetableComparator(); -// //TreeSet result = new TreeSet(comparator); -// List result = new ArrayList(); -// first = true; -// for (APTPreprocHandler handler : handlers) { -// APTFindUnusedBlocksWalker walker = new APTFindUnusedBlocksWalker(apt, fileImpl, handler, fileImpl.getAPTCacheEntry(handler)); -// walker.visit(); -// List blocks = walker.getBlocks(); -// if (first) { -// result = blocks; -// first = false; -// } else { -// result = intersection(result, blocks); -// if (result.isEmpty()) { -// break; -// } -// } -// } -// out = result; -// } -// } -// } catch (IOException ex) { -// System.err.println("skip getting unused blocks\nreason:" + ex.getMessage()); //NOI18N -// DiagnosticExceptoins.register(ex); -// } } return out; } @@ -269,18 +230,16 @@ APTPreprocHandler handler = handlers.iterator().next(); APTFileCacheEntry cacheEntry = fileImpl.getAPTCacheEntry(handler, true); APTFindMacrosWalker walker = new APTFindMacrosWalker(apt, fileImpl, handler, cacheEntry); - walker.getTokenStream(); + out = walker.collectMacros(); fileImpl.setAPTCacheEntry(handler, cacheEntry, false); - out = walker.getCollectedData(); } else { Comparator comparator = new OffsetableComparator(); TreeSet result = new TreeSet(comparator); for (APTPreprocHandler handler : handlers) { APTFileCacheEntry cacheEntry = fileImpl.getAPTCacheEntry(handler, true); APTFindMacrosWalker walker = new APTFindMacrosWalker(apt, fileImpl, handler, cacheEntry); - walker.getTokenStream(); + result.addAll(walker.collectMacros()); fileImpl.setAPTCacheEntry(handler, cacheEntry, false); - result.addAll(walker.getCollectedData()); } out = new ArrayList(result); } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTDefinesCollectorWalker.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTDefinesCollectorWalker.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTDefinesCollectorWalker.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTDefinesCollectorWalker.java @@ -76,8 +76,8 @@ } @Override - protected APTWalker createIncludeWalker(APTFile apt, APTSelfWalker parent, CharSequence includePath) { - return new APTDefinesCollectorWalker(apt, parent.csmFile, ((APTDefinesCollectorWalker) parent).getPreprocHandler(), macroRefMap, includePath, null); + protected APTWalker createIncludeWalker(APTFile apt, APTSelfWalker parent, CharSequence includePath, APTFileCacheEntry cache) { + return new APTDefinesCollectorWalker(apt, parent.csmFile, ((APTDefinesCollectorWalker) parent).getPreprocHandler(), macroRefMap, includePath, cache); } @Override diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTFindMacrosWalker.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTFindMacrosWalker.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTFindMacrosWalker.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTFindMacrosWalker.java @@ -43,14 +43,12 @@ import antlr.TokenStream; import antlr.TokenStreamException; -import java.io.File; import java.util.ArrayList; -import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Map; import org.netbeans.modules.cnd.api.model.CsmFile; import org.netbeans.modules.cnd.api.model.CsmMacro; +import org.netbeans.modules.cnd.api.model.CsmModelAccessor; import org.netbeans.modules.cnd.api.model.CsmObject; import org.netbeans.modules.cnd.api.model.services.CsmSelect; import org.netbeans.modules.cnd.api.model.services.CsmSelect.CsmFilter; @@ -77,21 +75,16 @@ import org.netbeans.modules.cnd.modelimpl.csm.core.ProjectBase; import org.netbeans.modules.cnd.modelimpl.csm.core.Unresolved; import org.netbeans.modules.cnd.modelimpl.debug.DiagnosticExceptoins; -import org.netbeans.modules.cnd.modelimpl.textcache.DefaultCache; -import org.netbeans.modules.cnd.modelimpl.uid.UIDCsmConverter; -import org.netbeans.modules.cnd.utils.cache.CndFileUtils; -import org.netbeans.modules.cnd.utils.cache.TextCache; /** - * Basic walker to find macroes for semantic highlighting - * TODO: maybe it should be one walker for any semantic HL activity, because - * they used altogether. + * Walker to find macros used in file for semantic highlighting * * @author Sergey Grinev + * @author Vladimir Voskresensky */ -public class APTFindMacrosWalker extends APTDefinesCollectorWalker { - protected final Map macro2file = new HashMap(); +public final class APTFindMacrosWalker extends APTSelfWalker { + private final List references = new ArrayList(); public APTFindMacrosWalker(APTFile apt, CsmFile csmFile, APTPreprocHandler preprocHandler, APTFileCacheEntry cacheEntry) { super(apt, csmFile, preprocHandler, cacheEntry); @@ -101,13 +94,19 @@ protected void onDefine(APT apt) { APTDefine defineNode = (APTDefine) apt; APTToken name = defineNode.getName(); + MacroReference mr = null; if (name != null) { - MacroInfo mi = new MacroInfo(csmFile, defineNode.getOffset(), null); - CsmReference mf = new MacroReference(csmFile, name, mi); - references.add(mf); + mr = new MacroReference(csmFile, name, null, CsmReferenceKind.DECLARATION); + references.add(mr); } analyzeList(defineNode.getBody()); super.onDefine(apt); + if (mr != null) { + APTMacro m = getMacroMap().getMacro(name); + if (m != null) { + mr.setMacro(m); + } + } } @Override @@ -133,7 +132,6 @@ analyzeToken(((APTIfdef) apt).getMacroName(), false); return super.onIfdef(apt); } - private final List references = new ArrayList(); @Override protected void onUndef(APT apt) { @@ -153,15 +151,10 @@ super.onIncludeNext(apt); } - public List getCollectedData() { - return references; - } - - @Override - public TokenStream getTokenStream() { + public List collectMacros() { TokenStream ts = super.getTokenStream(); analyzeStream(ts, true); - return null; // tokenstream set to EOF? it's no good + return references; } private CsmReference analyzeToken(APTToken token, boolean addOnlyIfNotFunLikeMacro) { @@ -174,19 +167,7 @@ funLike = m.isFunctionLike(); switch(m.getKind()){ case DEFINED: - MacroInfo mi = getMacroInfo(token); - if (mi == null) { - CsmFile macroContainter = getMacroFile(m); - if (macroContainter != null) { - mi = new MacroInfo(macroContainter, m.getDefineNode().getOffset(), m.getFile()); - } - } - if (mi != null) { - mf = new MacroReference(csmFile, token, mi); - } else { - // as backup - mf = new SysMacroReference(csmFile, token, m); - } + mf = new MacroReference(csmFile, token, m, CsmReferenceKind.DIRECT_USAGE); break; case COMPILER_PREDEFINED: case POSITION_PREDEFINED: @@ -238,12 +219,13 @@ } } - private static class SysMacroReference extends OffsetableBase implements CsmReference { + private static final class SysMacroReference extends OffsetableBase implements CsmReference { private final CsmObject ref; - + private final CharSequence text; public SysMacroReference(CsmFile file, APTToken token, APTMacro macro) { super(file, token.getOffset(), token.getEndOffset()); + text = token.getTextID(); CsmMacro.Kind kind; switch(macro.getKind()) { case COMPILER_PREDEFINED: @@ -271,113 +253,108 @@ } public CsmObject getOwner() { - return null; + return getContainingFile(); } public CsmReferenceKind getKind() { - return CsmReferenceKind.DECLARATION; + return CsmReferenceKind.DIRECT_USAGE; } @Override public CharSequence getText() { - return TextCache.getManager().getString(super.getText()); + return text; } } - private static class MacroReference extends OffsetableBase implements CsmReference { + private static final class MacroReference extends OffsetableBase implements CsmReference { - private CsmObject ref; + private volatile CsmMacro ref = null; private final CharSequence macroName; - private final MacroInfo mi; - - public MacroReference(CsmFile file, APTToken macro, MacroInfo mi) { - super(file, macro.getOffset(), macro.getEndOffset()); - this.macroName = macro.getTextID(); + private APTMacro macro; + private final CsmReferenceKind kind; + public MacroReference(CsmFile macroUsageFile, APTToken macroUsageToken, APTMacro macro, CsmReferenceKind kind) { + super(macroUsageFile, macroUsageToken.getOffset(), macroUsageToken.getEndOffset()); + this.macroName = macroUsageToken.getTextID(); assert macroName != null; -// this.isSystem = isSystem != null ? isSystem.booleanValue() : mi != null; -// assert !(isSystem != null && isSystem.booleanValue() && mi != null); - this.mi = mi; + this.macro = macro; + this.kind = kind; } public CsmObject getReferencedObject() { - if (ref == null && mi != null) { - CsmFile target = getTargetFile(); - if (target != null) { - CsmFilter filter = CsmSelect.getFilterBuilder().createNameFilter(macroName, true, true, false); - for (Iterator it = CsmSelect.getMacros(target, filter); it.hasNext();) { - CsmMacro macro = it.next(); - if (macro!=null && mi.startOffset == macro.getStartOffset()) { - ref = macro; + CsmMacro refObj = ref; + if (refObj == null && macro != null) { + synchronized (this) { + refObj = ref; + if (refObj == null) { + int macroStartOffset = macro.getDefineNode().getOffset(); + CsmFile target = getTargetFile(); + if (target != null) { + CsmFilter filter = CsmSelect.getFilterBuilder().createNameFilter(macroName, true, true, false); + for (Iterator it = CsmSelect.getMacros(target, filter); it.hasNext();) { + CsmMacro targetFileMacro = it.next(); + if (targetFileMacro!=null && macroStartOffset == targetFileMacro.getStartOffset()) { + refObj = targetFileMacro; + break; + } + } + if (refObj == null) { + // reference was made so it was macro during APTFindMacrosWalker's walk. Parser missed this variance of header and + // we have to create MacroImpl for skipped filepart on the spot (see IZ#130897) + if (target instanceof Unresolved.UnresolvedFile) { + refObj = MacroImpl.createSystemMacro(macroName, "", target, CsmMacro.Kind.USER_SPECIFIED); + } else { + refObj = new MacroImpl(macroName, null, "", target, new OffsetableBase(target, macroStartOffset, macroStartOffset + macroName.length()), CsmMacro.Kind.DEFINED); + org.netbeans.modules.cnd.modelimpl.csm.core.Utils.setSelfUID(refObj); + } + } } - } - if (ref == null) { - // reference was made so it was macro during APTFindMacrosWalker's walk. Parser missed this variance of header and - // we have to create MacroImpl for skipped filepart on the spot (see IZ#130897) - if (target instanceof Unresolved.UnresolvedFile) { - ref = MacroImpl.createSystemMacro(macroName, "", target, CsmMacro.Kind.USER_SPECIFIED); - } else { - ref = new MacroImpl(macroName, null, "", target, new OffsetableBase(target, mi.startOffset, mi.startOffset+macroName.length()), CsmMacro.Kind.DEFINED); - org.netbeans.modules.cnd.modelimpl.csm.core.Utils.setSelfUID(ref); - } + ref = refObj; } } } - return ref; + return refObj; } private CsmFile getTargetFile() { - CsmFile current = UIDCsmConverter.UIDtoFile(mi.targetFile); - if (current != null && mi.includePath != null && mi.includePath.length() > 0) { - File searchFile = new File(mi.includePath.toString()); - ProjectBase targetPrj = ((ProjectBase) current.getProject()).findFileProject(searchFile.getAbsolutePath()); - if (targetPrj == null) { - searchFile = CndFileUtils.normalizeFile(searchFile); - targetPrj = ((ProjectBase) current.getProject()).findFileProject(searchFile.getAbsolutePath()); + CsmFile current = this.getContainingFile(); + CsmFile target; + if (kind == CsmReferenceKind.DECLARATION) { + target = current; + } else { + target = null; + CharSequence macroContainerFile = macro.getFile(); + if (current != null && macroContainerFile.length() > 0) { + ProjectBase targetPrj = ((ProjectBase) current.getProject()).findFileProject(macroContainerFile); + if (targetPrj != null) { + target = targetPrj.findFile(macroContainerFile); + } + // try full model? + if (target == null) { + target = CsmModelAccessor.getModel().findFile(macroContainerFile); + } + if (target == null && targetPrj != null) { + target = targetPrj.getUnresolvedFile(); + } } - if (targetPrj != null) { - current = targetPrj.getFile(searchFile, false); - // if file belongs to project, it should be not null - // but info could be obsolete - } - // try full model? -// if (current == null) { -// current = CsmModelAccessor.getModel().findFile(mi.includePath); -// } } - return current; + return target; } public CsmObject getOwner() { - return getTargetFile(); + return (kind == CsmReferenceKind.DECLARATION) ? getContainingFile() : getReferencedObject(); } public CsmReferenceKind getKind() { - return CsmReferenceKind.DECLARATION; + return kind; } @Override public CharSequence getText() { - return DefaultCache.getManager().getString(super.getText()); + return macroName; + } + + private void setMacro(APTMacro m) { + this.macro = m; } } - - private CsmFile getMacroFile(APTMacro m) { - CsmFile out = null; - CharSequence path = m.getFile(); - if (path.length() > 0) { - out = macro2file.get(path); - if (out == null) { - ProjectBase targetPrj = ((ProjectBase) csmFile.getProject()).findFileProject(path); - if (targetPrj != null) { - out = targetPrj.getFile(new File(path.toString()), false); - // if file belongs to project, it should be not null - // but info could be obsolete - } - if (out != null) { - macro2file.put(path, out); - } - } - } - return out; - } } \ No newline at end of file diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java @@ -51,8 +51,10 @@ import org.netbeans.modules.cnd.apt.support.APTIncludeHandler; import org.netbeans.modules.cnd.apt.support.APTIncludeHandler.IncludeInfo; import org.netbeans.modules.cnd.apt.support.APTMacroMap; +import org.netbeans.modules.cnd.apt.support.APTMacroMap.State; import org.netbeans.modules.cnd.apt.support.APTPreprocHandler; import org.netbeans.modules.cnd.apt.support.APTWalker; +import org.netbeans.modules.cnd.apt.support.ResolvedPath; import org.netbeans.modules.cnd.modelimpl.csm.core.FileImpl; import org.netbeans.modules.cnd.modelimpl.csm.core.ProjectBase; @@ -121,7 +123,8 @@ APTFileCacheEntry cacheEntry = csmFile.getAPTCacheEntry(preprocHandler, false); APTWalker walker = new APTRestorePreprocStateWalker(getStartProject(), aptLight, csmFile, preprocHandler, inclStack, interestedFile,cacheEntry); walker.visit(); - csmFile.setAPTCacheEntry(preprocHandler, cacheEntry, false); + // we do not remember cache entry as serial because stopped before #include directive + // csmFile.setAPTCacheEntry(preprocHandler, cacheEntry, false); } else { // expected #included file was deleted csmFile = null; @@ -135,6 +138,7 @@ APTFileCacheEntry cacheEntry = csmFile.getAPTCacheEntry(preprocHandler, false); APTWalker walker = new APTRestorePreprocStateWalker(getStartProject(), aptLight, csmFile, preprocHandler,cacheEntry); walker.visit(); + // remember walk info csmFile.setAPTCacheEntry(preprocHandler, cacheEntry, false); } else { // expected #included file was deleted @@ -170,6 +174,14 @@ // See IZ119620, IZ120478 } } - - + + @Override + protected boolean include(ResolvedPath resolvedPath, APTInclude apt, State postIncludeState) { + boolean ret = super.include(resolvedPath, apt, postIncludeState); + // does not allow to store post include state if we stopped before #include directive + if (hasIncludeActionSideEffects() && isStopped()) { + ret = false; + } + return ret; + } } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java @@ -37,6 +37,7 @@ import org.netbeans.modules.cnd.apt.support.APTAbstractWalker; import org.netbeans.modules.cnd.apt.support.APTDriver; import org.netbeans.modules.cnd.apt.support.APTFileCacheEntry; +import org.netbeans.modules.cnd.apt.support.APTFileCacheManager; import org.netbeans.modules.cnd.apt.support.APTMacroMap; import org.netbeans.modules.cnd.apt.support.APTPreprocHandler; import org.netbeans.modules.cnd.apt.support.APTWalker; @@ -68,7 +69,11 @@ if (resolvedPath != null && getIncludeHandler().pushInclude(resolvedPath.getPath(), aptInclude, resolvedPath.getIndex())) { try { APTFile apt = APTDriver.getInstance().findAPTLight(new FileBufferFile(new File(resolvedPath.getPath().toString()))); - createIncludeWalker(apt, this, resolvedPath.getPath()).visit(); + APTPreprocHandler preprocHandler = getPreprocHandler(); + APTFileCacheEntry cache = APTFileCacheManager.getEntry(resolvedPath.getPath(),preprocHandler, false); + createIncludeWalker(apt, this, resolvedPath.getPath(), cache).visit(); + // remember walk + APTFileCacheManager.setAPTCacheEntry(resolvedPath.getPath(), preprocHandler, cache, false); } catch (FileNotFoundException ex) { APTUtils.LOG.log(Level.WARNING, "APTSelfWalker: file {0} not found", new Object[] {resolvedPath.getPath()});// NOI18N DiagnosticExceptoins.register(ex); @@ -82,8 +87,8 @@ return postIncludeState == null; } - protected APTWalker createIncludeWalker(APTFile apt, APTSelfWalker parent, CharSequence includePath) { - return new APTSelfWalker(apt, parent.csmFile, parent.getPreprocHandler(), null); + protected APTWalker createIncludeWalker(APTFile apt, APTSelfWalker parent, CharSequence includePath, APTFileCacheEntry cache) { + return new APTSelfWalker(apt, parent.csmFile, parent.getPreprocHandler(), cache); } @Override diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/AbstractKey.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/AbstractKey.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/AbstractKey.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/AbstractKey.java @@ -76,6 +76,10 @@ return Behavior.Default; } + public boolean hasCache() { + return false; + } + public abstract int getSecondaryAt(int level); public abstract CharSequence getAt(int level); diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/ClassifierContainerKey.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/ClassifierContainerKey.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/ClassifierContainerKey.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/ClassifierContainerKey.java @@ -83,6 +83,11 @@ } @Override + public boolean hasCache() { + return true; + } + + @Override public String toString() { return "ClassifierContainerKey " + getProjectName(); // NOI18N } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/DeclarationContainerKey.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/DeclarationContainerKey.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/DeclarationContainerKey.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/DeclarationContainerKey.java @@ -87,4 +87,9 @@ public Key.Behavior getBehavior() { return Key.Behavior.LargeAndMutable; } + + @Override + public boolean hasCache() { + return true; + } } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/FileContainerKey.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/FileContainerKey.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/FileContainerKey.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/FileContainerKey.java @@ -50,7 +50,7 @@ * Key for FileContainer data * @author Vladimir Kvashin */ -public class FileContainerKey extends ProjectNameBasedKey { +final public class FileContainerKey extends ProjectNameBasedKey { public FileContainerKey(String project) { super(project); @@ -85,7 +85,7 @@ } @Override - public Key.Behavior getBehavior() { - return Key.Behavior.LargeAndMutable; + public boolean hasCache() { + return true; } } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/FileKey.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/FileKey.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/FileKey.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/FileKey.java @@ -83,4 +83,9 @@ assert level == 0; return KeyObjectFactory.KEY_FILE_KEY; } + + @Override + public boolean hasCache() { + return true; + } } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/GraphContainerKey.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/GraphContainerKey.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/GraphContainerKey.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/GraphContainerKey.java @@ -43,14 +43,13 @@ import java.io.DataInput; import java.io.IOException; import org.netbeans.modules.cnd.modelimpl.csm.core.CsmObjectFactory; -import org.netbeans.modules.cnd.repository.spi.Key; import org.netbeans.modules.cnd.repository.spi.PersistentFactory; /** * Key for GraphContainer data * @author Vladimir Kvashin */ -public class GraphContainerKey extends ProjectNameBasedKey { +final public class GraphContainerKey extends ProjectNameBasedKey { public GraphContainerKey(String project) { super(project); @@ -84,7 +83,7 @@ } @Override - public Key.Behavior getBehavior() { - return Key.Behavior.LargeAndMutable; + public boolean hasCache() { + return true; } } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/NamespaceDeclarationContainerKey.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/NamespaceDeclarationContainerKey.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/NamespaceDeclarationContainerKey.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/NamespaceDeclarationContainerKey.java @@ -43,12 +43,13 @@ import java.io.DataOutput; import java.io.IOException; import org.netbeans.modules.cnd.api.model.CsmNamespace; +import org.netbeans.modules.cnd.repository.spi.Key; /** * * @author Vladimir Voskresensky */ -public class NamespaceDeclarationContainerKey extends NamespaceKey { +final public class NamespaceDeclarationContainerKey extends NamespaceKey { public NamespaceDeclarationContainerKey(CsmNamespace ns) { super(ns); @@ -78,4 +79,14 @@ /*package*/ NamespaceDeclarationContainerKey(DataInput aStream) throws IOException { super(aStream); } + + @Override + public Key.Behavior getBehavior() { + return Behavior.LargeAndMutable; + } + + @Override + public boolean hasCache() { + return true; + } } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/NamespaceKey.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/NamespaceKey.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/NamespaceKey.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/NamespaceKey.java @@ -138,4 +138,9 @@ public Key.Behavior getBehavior() { return Behavior.LargeAndMutable; } + + @Override + public boolean hasCache() { + return true; + } } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/ProjectKey.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/ProjectKey.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/ProjectKey.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/ProjectKey.java @@ -88,5 +88,9 @@ public Key.Behavior getBehavior() { return Behavior.LargeAndMutable; } - + + @Override + public boolean hasCache() { + return true; + } } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/RepositoryUtils.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/RepositoryUtils.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/RepositoryUtils.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/RepositoryUtils.java @@ -56,6 +56,7 @@ import org.netbeans.modules.cnd.modelimpl.csm.core.Disposable; import org.netbeans.modules.cnd.modelimpl.csm.core.ProjectBase; import org.netbeans.modules.cnd.modelimpl.debug.TraceFlags; +import org.netbeans.modules.cnd.modelimpl.uid.KeyBasedUID; import org.netbeans.modules.cnd.modelimpl.uid.UIDProviderIml; import org.netbeans.modules.cnd.repository.api.Repository; import org.netbeans.modules.cnd.repository.api.RepositoryAccessor; @@ -123,7 +124,7 @@ return counter++; } - public static void remove(CsmUID uid) { + public static void remove(CsmUID uid, CsmObject obj) { Key key = UIDtoKey(uid); if (key != null) { try { @@ -142,17 +143,22 @@ repository.remove(key); } } finally { - if (uid instanceof Disposable) { - ((Disposable)uid).dispose(); - } + disposeUID(uid, obj); } } } + @SuppressWarnings("unchecked") + public static void disposeUID(CsmUID uid, CsmObject obj) { + if (uid instanceof KeyBasedUID) { + ((KeyBasedUID)uid).dispose(obj); + } + } + public static void remove(Collection uids) { if (uids != null) { for (CsmUID uid : uids) { - remove(uid); + remove(uid, null); } } } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/uid/KeyBasedUID.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/uid/KeyBasedUID.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/uid/KeyBasedUID.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/uid/KeyBasedUID.java @@ -71,6 +71,8 @@ return key; } + public abstract void dispose(T obj); + @Override public String toString() { String retValue; diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/uid/UIDUtilities.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/uid/UIDUtilities.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/uid/UIDUtilities.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/uid/UIDUtilities.java @@ -43,6 +43,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; +import java.lang.ref.Reference; +import java.lang.ref.SoftReference; import java.lang.ref.WeakReference; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; @@ -365,39 +367,44 @@ /** * Base UID for cached objects */ - /* package */ static class CachedUID extends KeyBasedUID implements Disposable { - private WeakReference weakT = TraceFlags.USE_WEAK_MEMORY_CACHE ? new WeakReference(null) : null; + /* package */ static class CachedUID extends KeyBasedUID { + private static final SoftReference DUMMY = new SoftReference(null); + private Reference weakT; - protected CachedUID(Key key) { + protected CachedUID(Key key, T obj) { super(key); + weakT = TraceFlags.USE_WEAK_MEMORY_CACHE && key.hasCache() ? new WeakReference(obj) : DUMMY; } - /* package */ CachedUID(DataInput aStream) throws IOException { + CachedUID(DataInput aStream) throws IOException { super(aStream); + weakT = TraceFlags.USE_WEAK_MEMORY_CACHE && getKey().hasCache() ? new WeakReference(null) : DUMMY; } @Override + @SuppressWarnings("unchecked") public T getObject() { T out = null; - WeakReference weak = null; - if (TraceFlags.USE_WEAK_MEMORY_CACHE) { - weak = weakT; - if (weak != null) { - out = weak.get(); - if (out != null) { - return out; - } + Reference weak = (Reference) weakT; + if (weak != DUMMY) { + out = weak.get(); + if (out != null) { + return out; } } out = RepositoryUtils.get(this); - if (TraceFlags.USE_WEAK_MEMORY_CACHE && out != null && weak != null) { - weakT = new WeakReference(out); + if (out != null && weak != DUMMY) { + weakT = (Reference) new WeakReference(out); } return out; } - public void dispose() { - weakT = null; + public void dispose(T obj) { + if (obj == null) { + weakT = DUMMY; + } else { + weakT = new SoftReference(obj); + } } } @@ -407,7 +414,7 @@ /* package */ static final class ProjectUID extends CachedUID { //KeyBasedUID { public ProjectUID(ProjectBase project) { - super(KeyUtilities.createProjectKey(project)); + super(KeyUtilities.createProjectKey(project), project); } /* package */ ProjectUID(DataInput aStream) throws IOException { @@ -421,7 +428,7 @@ /* package */ static final class NamespaceUID extends CachedUID { //KeyBasedUID { public NamespaceUID(CsmNamespace ns) { - super(KeyUtilities.createNamespaceKey(ns)); + super(KeyUtilities.createNamespaceKey(ns), ns); } /* package */ NamespaceUID(DataInput aStream) throws IOException { @@ -435,7 +442,7 @@ /* package */ static final class FileUID extends CachedUID { //KeyBasedUID { public FileUID(FileImpl file) { - super(KeyUtilities.createFileKey(file)); + super(KeyUtilities.createFileKey(file), file); } /* package */ FileUID(DataInput aStream) throws IOException { @@ -446,14 +453,14 @@ /** * base UID for CsmDeclaration */ - private static abstract class OffsetableDeclarationUIDBase extends KeyBasedUID { + private static abstract class OffsetableDeclarationUIDBase extends CachedUID { //KeyBasedUID { public OffsetableDeclarationUIDBase(T declaration) { - this(KeyUtilities.createOffsetableDeclarationKey((OffsetableDeclarationBase) declaration)); + this(KeyUtilities.createOffsetableDeclarationKey((OffsetableDeclarationBase) declaration), declaration); } - protected OffsetableDeclarationUIDBase(Key key) { - super(key); + protected OffsetableDeclarationUIDBase(Key key, T obj) { + super(key, obj); } /* package */ OffsetableDeclarationUIDBase(DataInput aStream) throws IOException { @@ -477,11 +484,11 @@ private static abstract class OffsetableDeclarationUIDBaseCached extends CachedUID { //KeyBasedUID { public OffsetableDeclarationUIDBaseCached(T declaration) { - this(KeyUtilities.createOffsetableDeclarationKey((OffsetableDeclarationBase) declaration)); + this(KeyUtilities.createOffsetableDeclarationKey((OffsetableDeclarationBase) declaration), declaration); } - protected OffsetableDeclarationUIDBaseCached(Key key) { - super(key); + protected OffsetableDeclarationUIDBaseCached(Key key, T obj) { + super(key, obj); } /* package */ OffsetableDeclarationUIDBaseCached(DataInput aStream) throws IOException { @@ -527,10 +534,10 @@ /** * UID for CsmMacro */ - /* package */ static final class MacroUID extends KeyBasedUID { + /* package */ static final class MacroUID extends CachedUID { //KeyBasedUID { public MacroUID(CsmMacro macro) { - super(KeyUtilities.createMacroKey(macro)); + super(KeyUtilities.createMacroKey(macro), macro); } /* package */ MacroUID(DataInput aStream) throws IOException { @@ -541,10 +548,10 @@ /** * UID for CsmInclude */ - /* package */ static final class IncludeUID extends KeyBasedUID { + /* package */ static final class IncludeUID extends CachedUID { //KeyBasedUID { public IncludeUID(CsmInclude incl) { - super(KeyUtilities.createIncludeKey(incl)); + super(KeyUtilities.createIncludeKey(incl), incl); } /* package */ IncludeUID(DataInput aStream) throws IOException { @@ -555,10 +562,10 @@ /** * UID for CsmParameterList */ - /* package */ static final class ParamListUID extends KeyBasedUID> { + /* package */ static final class ParamListUID extends CachedUID> { //KeyBasedUID> { public ParamListUID(CsmParameterList paramList) { - super(KeyUtilities.createParamListKey(paramList)); + super(KeyUtilities.createParamListKey(paramList), paramList); } /* package */ ParamListUID(DataInput aStream) throws IOException { @@ -610,7 +617,7 @@ /* package */ static final class UnnamedClassifierUID extends OffsetableDeclarationUIDBase { public UnnamedClassifierUID(T classifier, int index) { - super(KeyUtilities.createUnnamedOffsetableDeclarationKey((OffsetableDeclarationBase) classifier, index)); + super(KeyUtilities.createUnnamedOffsetableDeclarationKey((OffsetableDeclarationBase) classifier, index), classifier); } /* package */ UnnamedClassifierUID(DataInput aStream) throws IOException { @@ -629,7 +636,7 @@ /* package */ static final class UnnamedOffsetableDeclarationUID extends OffsetableDeclarationUIDBase { public UnnamedOffsetableDeclarationUID(T decl, int index) { - super(KeyUtilities.createUnnamedOffsetableDeclarationKey((OffsetableDeclarationBase) decl, index)); + super(KeyUtilities.createUnnamedOffsetableDeclarationKey((OffsetableDeclarationBase) decl, index), decl); } /* package */ UnnamedOffsetableDeclarationUID(DataInput aStream) throws IOException { diff --git a/cnd.remote/src/org/netbeans/modules/cnd/remote/sync/Bundle.properties b/cnd.remote/src/org/netbeans/modules/cnd/remote/sync/Bundle.properties --- a/cnd.remote/src/org/netbeans/modules/cnd/remote/sync/Bundle.properties +++ b/cnd.remote/src/org/netbeans/modules/cnd/remote/sync/Bundle.properties @@ -44,3 +44,13 @@ #in fact, description is not displayed in the UI in 6.7 SCP_Factory_Description=Use secure copy (scp) protocol for synchronization. SHARED_Factory_Description=Do not use synchronization. This assumes that project files reside in a shared directory that is visible from remote host. + +# {0} is the target directory; {1} is the target host display name +MSG_Copying=Copying project files to {0} at {1} + +# {0} is the target host display name +MSG_Cant_find_sync_root=Can not find directory to copy project to on host {0} + +# {0} is the target directory; {1} is the target host display name; +# {2} is the error message extracted from exception +MSG_Error_Copying=Error copying project files to {0} at {1}: \n{2} diff --git a/cnd.remote/src/org/netbeans/modules/cnd/remote/sync/ScpSyncWorker.java b/cnd.remote/src/org/netbeans/modules/cnd/remote/sync/ScpSyncWorker.java --- a/cnd.remote/src/org/netbeans/modules/cnd/remote/sync/ScpSyncWorker.java +++ b/cnd.remote/src/org/netbeans/modules/cnd/remote/sync/ScpSyncWorker.java @@ -49,10 +49,12 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.netbeans.modules.cnd.api.remote.RemoteSyncWorker; +import org.netbeans.modules.cnd.api.remote.ServerList; import org.netbeans.modules.cnd.remote.mapper.RemotePathMap; import org.netbeans.modules.cnd.remote.support.RemoteUtil; import org.netbeans.modules.nativeexecution.api.ExecutionEnvironment; import org.netbeans.modules.nativeexecution.api.util.CommonTasksSupport; +import org.openide.util.NbBundle; /** * @@ -88,36 +90,48 @@ public boolean synchronize() { - // determine the remote directory - RemotePathMap mapper = RemotePathMap.getRemotePathMapInstance(executionEnvironment); +// // determine the remote directory +// RemotePathMap mapper = RemotePathMap.getRemotePathMapInstance(executionEnvironment); +// +// // probably mapper already knows it? +// String remoteDir = mapper.getRemotePath(this.localDir.getAbsolutePath(), false); +// if (remoteDir == null) { +// // mapper does not know dir; let's check its parent +// String localParent = this.localDir.getParentFile().getAbsolutePath(); +// String remoteParent = mapper.getRemotePath(localParent, false); +// boolean addMapping = false; +// if (remoteParent == null) { +// // we can't map parent path either +// addMapping = true; +// remoteParent = getRemoteSyncRoot(); +// if (remoteParent == null) { +// if (mapper.checkRemotePath(localDir.getAbsolutePath(), true)) { +// remoteDir = mapper.getRemotePath(this.localDir.getAbsolutePath(), false); +// addMapping = false; +// } else { +// return false; +// } +// } +// } +// if (remoteDir == null) { +// remoteDir = remoteParent + '/' + localDir.getName(); //NOI18N +// } +// if (addMapping) { +// mapper.addMapping(localParent, remoteParent); +// } +// } - // probably mapper already knows it? - String remoteDir = mapper.getRemotePath(this.localDir.getAbsolutePath(), false); - if (remoteDir == null) { - // mapper does not know dir; let's check its parent - String localParent = this.localDir.getParentFile().getAbsolutePath(); - String remoteParent = mapper.getRemotePath(localParent, false); - boolean addMapping = false; - if (remoteParent == null) { - // we can't map parent path either - addMapping = true; - remoteParent = getRemoteSyncRoot(); - if (remoteParent == null) { - if (mapper.checkRemotePath(localDir.getAbsolutePath(), true)) { - remoteDir = mapper.getRemotePath(this.localDir.getAbsolutePath(), false); - addMapping = false; - } else { - return false; - } - } + // We should make no implicit assumptions. + // Later we'll allow user to specify where to copy project files to + String remoteParent = getRemoteSyncRoot(); + if (remoteParent == null) { + if (err != null) { + err.printf("%s\n", NbBundle.getMessage(getClass(), "MSG_Cant_find_sync_root", ServerList.get(executionEnvironment).toString())); } - if (remoteDir == null) { - remoteDir = remoteParent + '/' + localDir.getName(); //NOI18N - } - if (addMapping) { - mapper.addMapping(localParent, remoteParent); - } + return false; // TODO: } + String remoteDir = remoteParent + '/' + localDir.getName(); //NOI18N + boolean success = false; try { boolean same; @@ -131,8 +145,14 @@ (same ? " are same - skipping" : " arent same - copying")); //NOI18N } if (!same) { + if (out != null) { + out.printf("%s\n", NbBundle.getMessage(getClass(), "MSG_Copying", + remoteDir, ServerList.get(executionEnvironment).toString())); + } synchronizeImpl(remoteDir); } + RemotePathMap mapper = RemotePathMap.getRemotePathMapInstance(executionEnvironment); + mapper.addMapping(localDir.getParentFile().getAbsolutePath(), remoteParent); success = true; } catch (InterruptedException ex) { // reporting does not make sense, just return false @@ -142,8 +162,16 @@ logger.log(Level.FINEST, null, ex); } catch (ExecutionException ex) { logger.log(Level.FINE, null, ex); + if (err != null) { + err.printf("%s\n", NbBundle.getMessage(getClass(), "MSG_Error_Copying", + remoteDir, ServerList.get(executionEnvironment).toString(), ex.getLocalizedMessage())); + } } catch (IOException ex) { logger.log(Level.FINE, null, ex); + if (err != null) { + err.printf("%s asdasd \n", NbBundle.getMessage(getClass(), "MSG_Error_Copying", + remoteDir, ServerList.get(executionEnvironment).toString(), ex.getLocalizedMessage())); + } } return success; } diff --git a/cnd.repository.api/src/org/netbeans/modules/cnd/repository/spi/Key.java b/cnd.repository.api/src/org/netbeans/modules/cnd/repository/spi/Key.java --- a/cnd.repository.api/src/org/netbeans/modules/cnd/repository/spi/Key.java +++ b/cnd.repository.api/src/org/netbeans/modules/cnd/repository/spi/Key.java @@ -76,6 +76,12 @@ * @return key Behavior */ Behavior getBehavior(); + + /** + * return true if key may have a local L1 cache + * @return + */ + public boolean hasCache(); /** returns depth of primary key's hierarchy * * @return depth of primary key's hierarchy diff --git a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/disk/MemoryCacheTest.java b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/disk/MemoryCacheTest.java --- a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/disk/MemoryCacheTest.java +++ b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/disk/MemoryCacheTest.java @@ -216,5 +216,9 @@ public int getSecondaryAt(int level) { throw new UnsupportedOperationException("Not supported yet."); } + + public boolean hasCache() { + return false; + } } } diff --git a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/TryGetTest.java b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/TryGetTest.java --- a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/TryGetTest.java +++ b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/TryGetTest.java @@ -104,6 +104,10 @@ public Key.Behavior getBehavior() { return Key.Behavior.Default; } + + public boolean hasCache() { + return false; + } } private class LargeKey extends BaseKey { @@ -115,6 +119,10 @@ public Key.Behavior getBehavior() { return Key.Behavior.LargeAndMutable; } + + public boolean hasCache() { + return false; + } } private static class Value implements Persistent { diff --git a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/test/TestKey.java b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/test/TestKey.java --- a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/test/TestKey.java +++ b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/test/TestKey.java @@ -147,4 +147,7 @@ output.writeBoolean(behavior == Behavior.LargeAndMutable); } + public boolean hasCache() { + return false; + } } diff --git a/dlight.core.stack/src/org/netbeans/modules/dlight/core/stack/dataprovider/impl/FunctionsListDataProviderImpl.java b/dlight.core.stack/src/org/netbeans/modules/dlight/core/stack/dataprovider/impl/FunctionsListDataProviderImpl.java --- a/dlight.core.stack/src/org/netbeans/modules/dlight/core/stack/dataprovider/impl/FunctionsListDataProviderImpl.java +++ b/dlight.core.stack/src/org/netbeans/modules/dlight/core/stack/dataprovider/impl/FunctionsListDataProviderImpl.java @@ -93,7 +93,7 @@ Lookup.getDefault().lookupAll(SourceFileInfoProvider.class); for (SourceFileInfoProvider provider : sourceInfoProviders) { - final SourceFileInfo sourceInfo = provider.fileName(functionCall.getFunction().getName(), functionCall.getOffset(), serviceInfoStorage.getInfo()); + final SourceFileInfo sourceInfo = provider.fileName(functionCall.getFunction().getName(), -1, functionCall.getOffset(), serviceInfoStorage.getInfo()); if (sourceInfo != null && sourceInfo.isSourceKnown()) { return sourceInfo; } diff --git a/dlight.core.stack/src/org/netbeans/modules/dlight/core/stack/dataprovider/impl/StackDataProviderImpl.java b/dlight.core.stack/src/org/netbeans/modules/dlight/core/stack/dataprovider/impl/StackDataProviderImpl.java --- a/dlight.core.stack/src/org/netbeans/modules/dlight/core/stack/dataprovider/impl/StackDataProviderImpl.java +++ b/dlight.core.stack/src/org/netbeans/modules/dlight/core/stack/dataprovider/impl/StackDataProviderImpl.java @@ -117,7 +117,7 @@ Lookup.getDefault().lookupAll(SourceFileInfoProvider.class); for (SourceFileInfoProvider provider : sourceInfoProviders) { - final SourceFileInfo sourceInfo = provider.fileName(functionCall.getFunction().getName(), functionCall.getOffset(), serviceInfoDataStorage.getInfo()); + final SourceFileInfo sourceInfo = provider.fileName(functionCall.getFunction().getName(), -1, functionCall.getOffset(), serviceInfoDataStorage.getInfo()); if (sourceInfo != null && sourceInfo.isSourceKnown()) { return sourceInfo; } diff --git a/dlight.dtrace/src/org/netbeans/modules/dlight/dtrace/collector/support/DtraceDataCollector.java b/dlight.dtrace/src/org/netbeans/modules/dlight/dtrace/collector/support/DtraceDataCollector.java --- a/dlight.dtrace/src/org/netbeans/modules/dlight/dtrace/collector/support/DtraceDataCollector.java +++ b/dlight.dtrace/src/org/netbeans/modules/dlight/dtrace/collector/support/DtraceDataCollector.java @@ -530,6 +530,8 @@ private final class ProcessLineCallBackImpl implements ProcessLineCallback { + private long maxTimestamp; + public void processLine(String line) { DataRow dataRow = parser.process(line); if (dataRow != null) { @@ -537,21 +539,39 @@ storage.addData( tableMetaData.getName(), Arrays.asList(dataRow)); } - synchronized (indicatorDataBuffer) { - indicatorDataBuffer.add(dataRow); - if (indicatorDataBuffer.size() >= indicatorFiringFactor) { - if (isSlave) { - if (handler != null) { - handler.notify(indicatorDataBuffer); + long curTimestamp = getTimestamp(dataRow); + if (curTimestamp == -1 || maxTimestamp < curTimestamp) { + synchronized (indicatorDataBuffer) { + if (curTimestamp != -1) { + maxTimestamp = curTimestamp; + } + indicatorDataBuffer.add(dataRow); + if (indicatorDataBuffer.size() >= indicatorFiringFactor) { + if (isSlave) { + if (handler != null) { + handler.notify(indicatorDataBuffer); + } + } else { + notifyIndicators(indicatorDataBuffer); } - } else { - notifyIndicators(indicatorDataBuffer); + indicatorDataBuffer.clear(); } - indicatorDataBuffer.clear(); } } } } + + private long getTimestamp(DataRow row) { + Object timestamp = row.getData("timestamp"); // NOI18N + if (timestamp instanceof Number) { + return ((Number)timestamp).longValue(); + } else if (timestamp instanceof String) { + try { + return Long.parseLong((String)timestamp); + } catch (NumberFormatException ex) {} + } + return -1; + } } private class DtraceInputProcessorFactory implements InputProcessorFactory { diff --git a/dlight.memory/src/org/netbeans/modules/dlight/memory/resources/mem.d b/dlight.memory/src/org/netbeans/modules/dlight/memory/resources/mem.d --- a/dlight.memory/src/org/netbeans/modules/dlight/memory/resources/mem.d +++ b/dlight.memory/src/org/netbeans/modules/dlight/memory/resources/mem.d @@ -1,5 +1,9 @@ #!/usr/sbin/dtrace -ZCs #pragma D option quiet +#pragma D option bufsize=16m +#pragma D option switchrate=100hz +#pragma D option dynvarsize=16m +#pragma D option cleanrate=100hz /* the current total amount of memory allocated and not freed */ int total; diff --git a/dlight.perfan/src/org/netbeans/modules/dlight/perfan/dataprovider/SSStackDataProvider.java b/dlight.perfan/src/org/netbeans/modules/dlight/perfan/dataprovider/SSStackDataProvider.java --- a/dlight.perfan/src/org/netbeans/modules/dlight/perfan/dataprovider/SSStackDataProvider.java +++ b/dlight.perfan/src/org/netbeans/modules/dlight/perfan/dataprovider/SSStackDataProvider.java @@ -264,7 +264,7 @@ Lookup.getDefault().lookupAll(SourceFileInfoProvider.class); for (SourceFileInfoProvider provider : sourceInfoProviders) { - final SourceFileInfo sourceInfo = provider.fileName(functionCall.getFunction().getName(), functionCall.getOffset(), this.storage.getInfo()); + final SourceFileInfo sourceInfo = provider.fileName(functionCall.getFunction().getName(), (int)functionCall.getOffset(), -1, this.storage.getInfo()); if (sourceInfo != null && sourceInfo.isSourceKnown()) { return sourceInfo; } diff --git a/dlight.spi/src/org/netbeans/modules/dlight/spi/SourceFileInfoProvider.java b/dlight.spi/src/org/netbeans/modules/dlight/spi/SourceFileInfoProvider.java --- a/dlight.spi/src/org/netbeans/modules/dlight/spi/SourceFileInfoProvider.java +++ b/dlight.spi/src/org/netbeans/modules/dlight/spi/SourceFileInfoProvider.java @@ -46,7 +46,7 @@ */ public interface SourceFileInfoProvider { - SourceFileInfo fileName(String functionName, long offset, Map serviceInfo); + SourceFileInfo fileName(String functionName, int lineNumber, long offset, Map serviceInfo); public final class SourceFileInfo { diff --git a/dlight.visualizers/src/org/netbeans/modules/dlight/visualizers/api/impl/OpenFunctionInEditorActionProvider.java b/dlight.visualizers/src/org/netbeans/modules/dlight/visualizers/api/impl/OpenFunctionInEditorActionProvider.java --- a/dlight.visualizers/src/org/netbeans/modules/dlight/visualizers/api/impl/OpenFunctionInEditorActionProvider.java +++ b/dlight.visualizers/src/org/netbeans/modules/dlight/visualizers/api/impl/OpenFunctionInEditorActionProvider.java @@ -36,7 +36,7 @@ Lookup.getDefault().lookupAll(SourceFileInfoProvider.class); for (SourceFileInfoProvider provider : sourceInfoProviders) { - final SourceFileInfo sourceInfo = provider.fileName(functionName, 0, null); + final SourceFileInfo sourceInfo = provider.fileName(functionName, 0, 0, null); if (sourceInfo != null && sourceInfo.isSourceKnown()) { DLightExecutorService.submit(new Runnable() { diff --git a/php.editor/src/org/netbeans/modules/php/editor/indent/PHPFormatter.java b/php.editor/src/org/netbeans/modules/php/editor/indent/PHPFormatter.java --- a/php.editor/src/org/netbeans/modules/php/editor/indent/PHPFormatter.java +++ b/php.editor/src/org/netbeans/modules/php/editor/indent/PHPFormatter.java @@ -102,7 +102,7 @@ } // end of hotfix - reindent(context, null, true); + reindent(context, null); } public void reformat(Context context, ParserResult info) { @@ -478,7 +478,7 @@ } }); } - private void reindent(final Context context, ParserResult info, final boolean indentOnly) { + private void reindent(final Context context, ParserResult info) { Document document = context.document(); int startOffset = context.startOffset(); int endOffset = context.endOffset(); @@ -523,11 +523,9 @@ // wholesale formatting a whole document, leave these lines alone. boolean indentEmptyLines = (startOffset != 0 || endOffset != doc.getLength()); - boolean includeEnd = endOffset == doc.getLength() || indentOnly; - // TODO - remove initialbalance etc. computeIndents(doc, initialIndent, initialOffset, endOffset, info, - offsets, indents, indentEmptyLines, includeEnd, indentOnly); + offsets, indents, indentEmptyLines); // System.out.println("~~~ indents=" + indents.size() + ", offsets=" + offsets.size()); @@ -564,9 +562,7 @@ int actualPrevIndent = GsfUtilities.getLineIndent(doc, prevOffset); if (actualPrevIndent != prevIndent) { // For blank lines, indentation may be 0, so don't adjust in that case - if (indentOnly || !(Utilities.isRowEmpty(doc, prevOffset) || Utilities.isRowWhite(doc, prevOffset))) { - indent = actualPrevIndent + (indent-prevIndent); - } + indent = actualPrevIndent + (indent - prevIndent); } } @@ -589,11 +585,12 @@ } } - public void computeIndents(BaseDocument doc, int initialIndent, int startOffset, int endOffset, ParserResult info, + public void computeIndents(BaseDocument doc, int initialIndent, + int startOffset, int endOffset, + ParserResult info, List offsets, List indents, - boolean indentEmptyLines, boolean includeEnd, boolean indentOnly - ) { + boolean indentEmptyLines) { // PENDING: // The reformatting APIs in NetBeans should be lexer based. They are still // based on the old TokenID apis. Once we get a lexer version, convert this over. @@ -641,32 +638,11 @@ int bracketBalance = 0; boolean continued = false; - while ((!includeEnd && offset < end) || (includeEnd && offset <= end)) { + while (offset <= end) { int indent; // The indentation to be used for the current line int hangingIndent = continued ? (hiSize) : 0; - /** - * As most of this code was copy&pasted from JavaScript/Ruby formatter - * I'm copy pasting also intialization of initialIndent as done in Ruby - * formatter. - * TODO: PHP does not seem to have isEmbeddedDoc. is that OK? - */ - if (/*isEmbeddedDoc &&*/ !indentOnly) { - // Pick up the indentation level assigned by the HTML indenter; gets HTML structure - Map suggestedLineIndents = (Map)doc.getProperty("AbstractIndenter.lineIndents"); - if (suggestedLineIndents != null) { - Integer ind = suggestedLineIndents.get(Utilities.getLineOffset(doc, offset)); - if (ind != null) { - initialIndent = ind.intValue(); - } else { - initialIndent = 0; //getOffsetFromPrevLine(doc, offset); - } - } else { - initialIndent = 0; //getOffsetFromPrevLine(doc, offset); - } - } - if (lineUnformattable(doc, offset)) { // Skip this line - leave formatting as it is prior to reformatting indent = GsfUtilities.getLineIndent(doc, offset); # HG changeset patch # User ffjre@netbeans.org # Date 1243997741 -14400 # Node ID d1ff01398ee552a3c86be8e97a3554a95d30b185 # Parent f24c98f0d4f6956722565940e647f3b3965b6e52 # Parent 308f6a2b90f228e9007998383b183bdc34f79e09 Automated merge with http://hg.netbeans.org/ergonomics diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-nbm.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-nbm.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-nbm.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-nbm.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-netbeans-platform.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-netbeans-platform.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-netbeans-platform.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-netbeans-platform.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-open-apis.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-open-apis.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-open-apis.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-open-apis.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-sfs-browser.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-sfs-browser.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-sfs-browser.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-sfs-browser.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-xml-layers.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-xml-layers.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-xml-layers.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-xml-layers.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/modules_process.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/modules_process.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/modules_process.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/modules_process.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/modules_quickref.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/modules_quickref.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/modules_quickref.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/modules_quickref.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/nbmodule-about-system-filesystem.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/nbmodule-about-system-filesystem.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/nbmodule-about-system-filesystem.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/nbmodule-about-system-filesystem.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/nbmodule-about.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/nbmodule-about.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/nbmodule-about.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/nbmodule-about.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/richclientapp_process.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/richclientapp_process.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/richclientapp_process.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/richclientapp_process.html @@ -1,7 +1,7 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_jnlp.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_jnlp.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_jnlp.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_jnlp.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_nbm.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_nbm.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_nbm.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_nbm.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_plugins.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_plugins.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_plugins.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_plugins.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_zip.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_zip.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_zip.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_zip.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/about_create.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/about_create.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/about_create.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/about_create.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/apisupport_extending_skeletons.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/apisupport_extending_skeletons.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/apisupport_extending_skeletons.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/apisupport_extending_skeletons.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/apisupport_searching_apis.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/apisupport_searching_apis.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/apisupport_searching_apis.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/apisupport_searching_apis.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_actions.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_actions.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_actions.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_actions.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_code_generators.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_code_generators.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_code_generators.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_code_generators.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_file_types.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_file_types.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_file_types.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_file_types.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_file_wizards.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_file_wizards.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_file_wizards.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_file_wizards.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_j2se_library_descs.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_j2se_library_descs.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_j2se_library_descs.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_j2se_library_descs.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_language_support.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_language_support.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_language_support.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_language_support.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_options_panels.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_options_panels.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_options_panels.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_options_panels.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_project_templates.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_project_templates.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_project_templates.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_project_templates.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_quick_search_providers.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_quick_search_providers.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_quick_search_providers.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_quick_search_providers.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_update_centers.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_update_centers.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_update_centers.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_update_centers.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_window_components.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_window_components.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_window_components.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_window_components.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_wizards.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_wizards.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_wizards.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_wizards.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_code_generator.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_code_generator.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_code_generator.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_code_generator.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_file_type.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_file_type.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_file_type.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_file_type.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_javahelp.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_javahelp.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_javahelp.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_javahelp.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_language_support.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_language_support.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_language_support.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_language_support.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_license.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_license.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_license.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_license.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_module_installers.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_module_installers.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_module_installers.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_module_installers.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_options_panels.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_options_panels.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_options_panels.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_options_panels.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_project_template.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_project_template.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_project_template.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_project_template.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_quick_search_provider.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_quick_search_provider.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_quick_search_provider.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_quick_search_provider.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_uc_manually.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_uc_manually.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_uc_manually.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_uc_manually.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_update_centers.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_update_centers.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_update_centers.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_update_centers.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_window_component.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_window_component.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_window_component.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_window_component.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_wizard.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_wizard.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_wizard.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_wizard.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/libs_jhelp/about_libs_jhelp.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/libs_jhelp/about_libs_jhelp.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/libs_jhelp/about_libs_jhelp.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/libs_jhelp/about_libs_jhelp.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/netbeans_api_javadoc.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/netbeans_api_javadoc.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/netbeans_api_javadoc.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/netbeans_api_javadoc.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/about_project_wizards.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/about_project_wizards.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/about_project_wizards.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/about_project_wizards.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_library_wrapper.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_library_wrapper.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_library_wrapper.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_library_wrapper.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_module.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_module.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_module.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_module.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_module_suite.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_module_suite.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_module_suite.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_module_suite.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_platform_app.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_platform_app.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_platform_app.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_platform_app.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/using_netbeans_api_javadoc.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/using_netbeans_api_javadoc.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/using_netbeans_api_javadoc.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/using_netbeans_api_javadoc.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/credits.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/credits.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/credits.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/credits.html @@ -1,6 +1,6 @@ @@ -14,7 +14,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. +Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved. and Distribution License (the License). You may not use this file except in compliance with the License. @@ -30,7 +30,7 @@

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun +Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

Note: Sun is not responsible for the availability of third-party web diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/branding_plugins.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/branding_plugins.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/branding_plugins.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/branding_plugins.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/branding_window_system.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/branding_window_system.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/branding_window_system.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/branding_window_system.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/creating_splash_screen.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/creating_splash_screen.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/creating_splash_screen.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/creating_splash_screen.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/deploying_plugins.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/deploying_plugins.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/deploying_plugins.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/deploying_plugins.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/distributing_plugins.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/distributing_plugins.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/distributing_plugins.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/distributing_plugins.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/generate_autoupdate_descriptor.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/generate_autoupdate_descriptor.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/generate_autoupdate_descriptor.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/generate_autoupdate_descriptor.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/install_devide.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/install_devide.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/install_devide.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/install_devide.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/install_targetplatform.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/install_targetplatform.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/install_targetplatform.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/install_targetplatform.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/installing_plugins.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/installing_plugins.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/installing_plugins.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/installing_plugins.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/remove_unwanted_modules.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/remove_unwanted_modules.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/remove_unwanted_modules.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/remove_unwanted_modules.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/run_rich_client.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/run_rich_client.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/run_rich_client.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/run_rich_client.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/nbmodule-toc.xml b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/nbmodule-toc.xml --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/nbmodule-toc.xml +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/nbmodule-toc.xml @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/nbmodules.hs b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/nbmodules.hs --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/nbmodules.hs +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/nbmodules.hs @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/tbd.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/tbd.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/tbd.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/tbd.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/about.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/about.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/about.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/about.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/create_project.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/create_project.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/create_project.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/create_project.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/create_sample.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/create_sample.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/create_sample.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/create_sample.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/project_lifecycle.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/project_lifecycle.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/project_lifecycle.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/project_lifecycle.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/bpelhelp.hs b/bpel.help/javahelp/org/netbeans/modules/bpel/help/bpelhelp.hs --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/bpelhelp.hs +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/bpelhelp.hs @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

The contents of this file are subject to the terms of the Common Development and Distribution License (the License). You may not use this file except in compliance with the License.

You can obtain a copy of the License at http://www.netbeans.org/cddl.html or http://www.netbeans.org/cddl.txt.

When distributing Covered Code, include this CDDL Header Notice in each file and include the License file at http://www.netbeans.org/cddl.txt. If applicable, add the following below the CDDL Header, with the fields enclosed by brackets [] replaced by your own identifying information: "Portions Copyrighted [year] [name of copyright owner]"

-

The Original Software is NetBeans. The Initial Developer of the Original Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.

+

The Original Software is NetBeans. The Initial Developer of the Original Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

Note: Sun is not responsible for the availability of third-party web sites mentioned in this document and does not endorse and is not responsible or liable for any content, advertising, products, or other materials on or available from such sites or resources. Sun will not be responsible or liable for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods, or services available on or through any such sites or resources.

diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/about.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/about.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/about.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/about.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/breakpoints.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/breakpoints.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/breakpoints.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/breakpoints.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_execution.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_execution.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_execution.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_execution.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_partner_links.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_partner_links.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_partner_links.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_partner_links.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_process.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_process.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_process.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_process.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_sessions.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_sessions.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_sessions.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_sessions.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_threads.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_threads.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_threads.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_threads.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_variables.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_variables.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_variables.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_variables.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/fault_breakpoints.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/fault_breakpoints.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/fault_breakpoints.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/fault_breakpoints.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/monitor_debugger.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/monitor_debugger.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/monitor_debugger.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/monitor_debugger.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/start_stop.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/start_stop.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/start_stop.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/start_stop.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/watches.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/watches.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/watches.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/watches.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/about_correlation_and_wizard.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/about_correlation_and_wizard.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/about_correlation_and_wizard.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/about_correlation_and_wizard.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/add_props_navigator.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/add_props_navigator.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/add_props_navigator.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/add_props_navigator.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/apply_filters.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/apply_filters.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/apply_filters.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/apply_filters.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/change_message_flow.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/change_message_flow.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/change_message_flow.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/change_message_flow.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/collapse_show.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/collapse_show.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/collapse_show.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/collapse_show.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/create_correlation_manually.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/create_correlation_manually.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/create_correlation_manually.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/create_correlation_manually.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/create_diagram.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/create_diagram.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/create_diagram.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/create_diagram.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/documentation.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/documentation.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/documentation.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/documentation.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/finding_usages.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/finding_usages.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/finding_usages.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/finding_usages.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/import_wsdl_resources.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/import_wsdl_resources.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/import_wsdl_resources.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/import_wsdl_resources.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/open_diag.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/open_diag.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/open_diag.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/open_diag.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/using_find.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/using_find.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/using_find.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/using_find.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/validation.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/validation.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/validation.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/validation.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/ww_diagram_element_props.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/ww_diagram_element_props.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/ww_diagram_element_props.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/ww_diagram_element_props.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/about.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/about.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/about.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/about.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/about_variable.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/about_variable.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/about_variable.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/about_variable.html @@ -1,6 +1,6 @@ @@ -38,7 +38,7 @@ You can copy data from one variable to another variable using the BPEL Mapper. See Creating BPEL Mappings for details about copying data.

Using the BPEL Mapper you can also create an XPath 1.0 expression for a business process element that requires this expression.

Refactoring

-

The BPEL Designer automatically synchronizes the names of defined variables and their usages. For example, when you rename a variable, all its usages are adjusted automatically to reflect the new name, including the usage of this variable name inside XPath expressions. See Refactoring in BPEL Processes for details about the refactoring rules in the BPEL Designer.

+

The BPEL Designer automatically synchronizes the names of defined variables and their usages. For example, when you rename a variable, all its usages are adjusted automatically to reflect the new name, including the usage of this variable name inside XPath expressions.

See Also
Creating Variables
diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_compensation_handler.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_compensation_handler.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_compensation_handler.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_compensation_handler.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler_onalarm.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler_onalarm.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler_onalarm.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler_onalarm.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler_onevent.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler_onevent.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler_onevent.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler_onevent.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_termination_handler.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_termination_handler.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_termination_handler.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_termination_handler.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/assign.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/assign.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/assign.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/assign.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/compensate.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/compensate.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/compensate.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/compensate.html @@ -1,7 +1,7 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/compensatescope.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/compensatescope.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/compensatescope.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/compensatescope.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/create_variable.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/create_variable.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/create_variable.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/create_variable.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/empty.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/empty.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/empty.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/empty.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/exit.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/exit.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/exit.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/exit.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/flow.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/flow.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/flow.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/flow.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/for_each.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/for_each.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/for_each.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/for_each.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/if.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/if.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/if.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/if.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/invoke.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/invoke.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/invoke.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/invoke.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_basic_acts.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_basic_acts.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_basic_acts.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_basic_acts.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_struct_acts.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_struct_acts.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_struct_acts.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_struct_acts.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_web_svc.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_web_svc.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_web_svc.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_web_svc.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/partner_link.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/partner_link.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/partner_link.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/partner_link.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/pick.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/pick.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/pick.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/pick.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/receive.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/receive.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/receive.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/receive.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/repeat_until.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/repeat_until.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/repeat_until.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/repeat_until.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/reply.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/reply.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/reply.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/reply.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/rethrow.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/rethrow.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/rethrow.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/rethrow.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_catch.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_catch.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_catch.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_catch.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_catch_all.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_catch_all.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_catch_all.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_catch_all.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_fault_handler.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_fault_handler.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_fault_handler.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_fault_handler.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/sequence.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/sequence.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/sequence.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/sequence.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/throw.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/throw.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/throw.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/throw.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/wait.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/wait.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/wait.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/wait.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/while.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/while.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/while.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/while.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/logging/about_logging.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/logging/about_logging.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/logging/about_logging.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/logging/about_logging.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/about_mapper.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/about_mapper.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/about_mapper.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/about_mapper.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_functions.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_functions.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_functions.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_functions.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_mappings.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_mappings.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_mappings.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_mappings.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_predicates.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_predicates.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_predicates.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_predicates.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/add_correlation_props.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/add_correlation_props.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/add_correlation_props.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/add_correlation_props.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/add_imports_props.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/add_imports_props.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/add_imports_props.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/add_imports_props.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/bpel_process_wizard.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/bpel_process_wizard.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/bpel_process_wizard.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/bpel_process_wizard.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/bpel_project_props.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/bpel_project_props.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/bpel_project_props.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/bpel_project_props.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/correlation_invoke_props.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/correlation_invoke_props.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/correlation_invoke_props.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/correlation_invoke_props.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/correlation_props.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/correlation_props.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/correlation_props.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/correlation_props.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/for_props.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/for_props.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/for_props.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/for_props.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/new_input_variable.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/new_input_variable.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/new_input_variable.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/new_input_variable.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/pick_onmessage_props.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/pick_onmessage_props.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/pick_onmessage_props.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/pick_onmessage_props.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/project_soa_bpel_name_location.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/project_soa_bpel_name_location.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/project_soa_bpel_name_location.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/project_soa_bpel_name_location.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/repeat_every_props.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/repeat_every_props.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/repeat_every_props.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/repeat_every_props.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/throw_name_props.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/throw_name_props.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/throw_name_props.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/throw_name_props.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/until_props.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/until_props.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/until_props.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/until_props.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/about.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/about.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/about.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/about.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/add_bpel_project.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/add_bpel_project.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/add_bpel_project.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/add_bpel_project.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/build_deploy.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/build_deploy.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/build_deploy.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/build_deploy.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/build_project.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/build_project.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/build_project.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/build_project.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/test_run.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/test_run.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/test_run.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/test_run.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/add_files.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/add_files.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/add_files.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/add_files.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/add_package.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/add_package.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/add_package.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/add_package.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/cloning.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/cloning.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/cloning.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/cloning.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_elements.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_elements.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_elements.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_elements.html @@ -1,6 +1,6 @@ @@ -65,7 +65,6 @@
About BPEL Elements
Changing Message Flows
Switching Between Design and Source Views
-
Refactoring in BPEL Processes
diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_navig.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_navig.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_navig.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_navig.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_print.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_print.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_print.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_print.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_src_switch.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_src_switch.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_src_switch.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_src_switch.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_view.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_view.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_view.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_view.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/edit_files.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/edit_files.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/edit_files.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/edit_files.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav_bpelview.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav_bpelview.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav_bpelview.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav_bpelview.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav_xml.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav_xml.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav_xml.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav_xml.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/populate_catalog.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/populate_catalog.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/populate_catalog.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/populate_catalog.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/project_node.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/project_node.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/project_node.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/project_node.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed_open_edits.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed_open_edits.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed_open_edits.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed_open_edits.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed_validate_bpel.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed_validate_bpel.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed_validate_bpel.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed_validate_bpel.html @@ -1,6 +1,6 @@ diff --git a/cnd.modelutil/src/org/netbeans/modules/cnd/modelutil/CsmUtilities.java b/cnd.modelutil/src/org/netbeans/modules/cnd/modelutil/CsmUtilities.java --- a/cnd.modelutil/src/org/netbeans/modules/cnd/modelutil/CsmUtilities.java +++ b/cnd.modelutil/src/org/netbeans/modules/cnd/modelutil/CsmUtilities.java @@ -326,6 +326,10 @@ LanguagePath path = LanguagePath.get(MimeLookup.getLookup(mimeType).lookup(Language.class)); FileObject fileObject = (FileObject) inputAttributes.getValue(path, "dialogBinding.fileObject"); //NOI18N csmFile = CsmUtilities.getCsmFile(fileObject, waitParsing); + if (csmFile == null) { + Document d = (Document) inputAttributes.getValue(path, "dialogBinding.document"); //NOI18N + csmFile = d == null ? null : CsmUtilities.getCsmFile(d, waitParsing); + } } } } diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/about.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/about.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/about.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/about.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/add_jbi_module.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/add_jbi_module.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/add_jbi_module.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/add_jbi_module.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/caps_project_basic_create.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/caps_project_basic_create.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/caps_project_basic_create.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/caps_project_basic_create.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/create_project.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/create_project.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/create_project.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/create_project.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/deploy_project.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/deploy_project.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/deploy_project.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/deploy_project.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/javaee-deployment-settings.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/javaee-deployment-settings.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/javaee-deployment-settings.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/javaee-deployment-settings.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/javaee-module-options.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/javaee-module-options.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/javaee-module-options.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/javaee-module-options.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_adding_test.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_adding_test.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_adding_test.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_adding_test.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_customizing_input.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_customizing_input.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_customizing_input.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_customizing_input.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_running_tester.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_running_tester.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_running_tester.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_running_tester.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_setting_props.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_setting_props.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_setting_props.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_setting_props.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/verify-server-resources.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/verify-server-resources.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/verify-server-resources.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/verify-server-resources.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/about-casa.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/about-casa.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/about-casa.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/about-casa.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/building.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/building.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/building.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/building.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/clean-configuration.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/clean-configuration.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/clean-configuration.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/clean-configuration.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/config-extension.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/config-extension.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/config-extension.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/config-extension.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/connections.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/connections.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/connections.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/connections.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/design-view.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/design-view.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/design-view.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/design-view.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/disable-endpoint.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/disable-endpoint.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/disable-endpoint.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/disable-endpoint.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/editing-binding.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/editing-binding.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/editing-binding.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/editing-binding.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/editing-service-units.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/editing-service-units.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/editing-service-units.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/editing-service-units.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/navigator.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/navigator.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/navigator.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/navigator.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/opening.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/opening.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/opening.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/opening.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/credits.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/credits.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/credits.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/credits.html @@ -1,6 +1,6 @@ @@ -14,7 +14,7 @@

You can obtain a copy of the License at http://www.netbeans.org/cddl.html or http://www.netbeans.org/cddl.txt.

When distributing Covered Code, include this CDDL Header Notice in each file and include the License file at http://www.netbeans.org/cddl.txt. If applicable, add the following below the CDDL Header, with the fields enclosed by brackets [] replaced by your own identifying information: "Portions Copyrighted [year] [name of copyright owner]"

The Original Software is NetBeans. The Initial Developer of the Original Software - is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun Microsystems, Inc. + is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems,, Inc. All Rights Reserved.

Note: Sun is not responsible for the availability of third-party web sites mentioned in this document and does not endorse and is not responsible or liable for any content, advertising, products, or other materials on or available from such sites or resources. Sun will not be responsible or liable for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods, or services available on or through any such sites or resources.

diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/intro.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/intro.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/intro.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/intro.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/app-configuration.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/app-configuration.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/app-configuration.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/app-configuration.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/app-variables.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/app-variables.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/app-variables.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/app-variables.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_BindingComponents.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_BindingComponents.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_BindingComponents.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_BindingComponents.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_RuntimeFunctionality.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_RuntimeFunctionality.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_RuntimeFunctionality.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_RuntimeFunctionality.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_ServiceAssemblies.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_ServiceAssemblies.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_ServiceAssemblies.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_ServiceAssemblies.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_ServiceEngines.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_ServiceEngines.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_ServiceEngines.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_ServiceEngines.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_SharedLibraries.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_SharedLibraries.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_SharedLibraries.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_SharedLibraries.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/jbi_node_bc-properties.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/jbi_node_bc-properties.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/jbi_node_bc-properties.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/jbi_node_bc-properties.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/properties/caps_project_props.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/properties/caps_project_props.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/properties/caps_project_props.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/properties/caps_project_props.html @@ -1,6 +1,6 @@ diff --git a/dbschema/javahelp/org/netbeans/modules/dbschema/docs/HelpSet.hs b/dbschema/javahelp/org/netbeans/modules/dbschema/docs/HelpSet.hs --- a/dbschema/javahelp/org/netbeans/modules/dbschema/docs/HelpSet.hs +++ b/dbschema/javahelp/org/netbeans/modules/dbschema/docs/HelpSet.hs @@ -3,7 +3,7 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,7 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun +Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding diff --git a/dbschema/javahelp/org/netbeans/modules/dbschema/docs/dbschema.html b/dbschema/javahelp/org/netbeans/modules/dbschema/docs/dbschema.html --- a/dbschema/javahelp/org/netbeans/modules/dbschema/docs/dbschema.html +++ b/dbschema/javahelp/org/netbeans/modules/dbschema/docs/dbschema.html @@ -1,7 +1,7 @@ diff --git a/dbschema/javahelp/org/netbeans/modules/dbschema/docs/dbschema_recapture.html b/dbschema/javahelp/org/netbeans/modules/dbschema/docs/dbschema_recapture.html --- a/dbschema/javahelp/org/netbeans/modules/dbschema/docs/dbschema_recapture.html +++ b/dbschema/javahelp/org/netbeans/modules/dbschema/docs/dbschema_recapture.html @@ -1,7 +1,7 @@ diff --git a/dbschema/javahelp/org/netbeans/modules/dbschema/docs/ide.css b/dbschema/javahelp/org/netbeans/modules/dbschema/docs/ide.css --- a/dbschema/javahelp/org/netbeans/modules/dbschema/docs/ide.css +++ b/dbschema/javahelp/org/netbeans/modules/dbschema/docs/ide.css @@ -2,7 +2,7 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common @@ -25,7 +25,7 @@ * Contributor(s): * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun * Microsystems, Inc. All Rights Reserved. * * If you wish your version of this file to be governed by only the CDDL diff --git a/dbschema/javahelp/org/netbeans/modules/dbschema/docs/toc.xml b/dbschema/javahelp/org/netbeans/modules/dbschema/docs/toc.xml --- a/dbschema/javahelp/org/netbeans/modules/dbschema/docs/toc.xml +++ b/dbschema/javahelp/org/netbeans/modules/dbschema/docs/toc.xml @@ -3,7 +3,7 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/about_am.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/about_am.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/about_am.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/about_am.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/accessing_am_console.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/accessing_am_console.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/accessing_am_console.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/accessing_am_console.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/changing_props_am_instance.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/changing_props_am_instance.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/changing_props_am_instance.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/changing_props_am_instance.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_am_sec_mech.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_am_sec_mech.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_am_sec_mech.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_am_sec_mech.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_liberty_customkeystore.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_liberty_customkeystore.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_liberty_customkeystore.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_liberty_customkeystore.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_support_libertysaml.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_support_libertysaml.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_support_libertysaml.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_support_libertysaml.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/removing_am_instance.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/removing_am_instance.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/removing_am_instance.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/removing_am_instance.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/ww_am_instances.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/ww_am_instances.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/ww_am_instances.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/ww_am_instances.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_liberty.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_liberty.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_liberty.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_liberty.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_saml.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_saml.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_saml.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_saml.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_usernamepw.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_usernamepw.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_usernamepw.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_usernamepw.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_x509.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_x509.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_x509.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_x509.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/credits.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/credits.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/credits.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems,, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems,, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_amserverinstance.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_amserverinstance.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_amserverinstance.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_amserverinstance.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_securingwebserviceclient.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_securingwebserviceclient.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_securingwebserviceclient.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_securingwebserviceclient.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_securingwebserviceprovider.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_securingwebserviceprovider.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_securingwebserviceprovider.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_securingwebserviceprovider.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/identity-javahelp-toc.xml b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/identity-javahelp-toc.xml --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/identity-javahelp-toc.xml +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/identity-javahelp-toc.xml @@ -1,7 +1,7 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_liberty.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_liberty.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_liberty.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_liberty.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_saml.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_saml.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_saml.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_saml.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_usernamepw.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_usernamepw.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_usernamepw.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_usernamepw.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_x509.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_x509.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_x509.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_x509.html @@ -1,6 +1,6 @@ diff --git a/installer/components/products/nb-base/src/org/netbeans/installer/products/nb/base/ConfigurationLogic.java b/installer/components/products/nb-base/src/org/netbeans/installer/products/nb/base/ConfigurationLogic.java --- a/installer/components/products/nb-base/src/org/netbeans/installer/products/nb/base/ConfigurationLogic.java +++ b/installer/components/products/nb-base/src/org/netbeans/installer/products/nb/base/ConfigurationLogic.java @@ -38,6 +38,7 @@ import java.io.File; import java.io.IOException; import java.util.List; +import java.util.Locale; import java.util.Map; import org.netbeans.installer.product.Registry; import org.netbeans.installer.product.components.ProductConfigurationLogic; @@ -47,6 +48,7 @@ import org.netbeans.installer.utils.FileProxy; import org.netbeans.installer.utils.FileUtils; import org.netbeans.installer.utils.LogManager; +import org.netbeans.installer.utils.ResourceUtils; import org.netbeans.installer.utils.StringUtils; import org.netbeans.installer.utils.SystemUtils; import org.netbeans.installer.utils.applications.JavaUtils; @@ -633,8 +635,8 @@ // private ////////////////////////////////////////////////////////////////////// private Shortcut getDesktopShortcut(final File directory) { return getShortcut( - getString("CL.desktop.shortcut.name"), // NOI18N - getString("CL.desktop.shortcut.description"), // NOI18N + getStrings("CL.desktop.shortcut.name"), // NOI18N + getStrings("CL.desktop.shortcut.description"), // NOI18N getString("CL.desktop.shortcut.path"), // NOI18N directory); } @@ -642,22 +644,22 @@ private Shortcut getStartMenuShortcut(final File directory) { if (SystemUtils.isMacOS()) { return getShortcut( - getString("CL.start.menu.shortcut.name.macosx"), // NOI18N - getString("CL.start.menu.shortcut.description"), // NOI18N + getStrings("CL.start.menu.shortcut.name.macosx"), // NOI18N + getStrings("CL.start.menu.shortcut.description"), // NOI18N getString("CL.start.menu.shortcut.path"), // NOI18N directory); } else { return getShortcut( - getString("CL.start.menu.shortcut.name"), // NOI18N - getString("CL.start.menu.shortcut.description"), // NOI18N + getStrings("CL.start.menu.shortcut.name"), // NOI18N + getStrings("CL.start.menu.shortcut.description"), // NOI18N getString("CL.start.menu.shortcut.path"), // NOI18N directory); } } private Shortcut getShortcut( - final String name, - final String description, + final Map names, + final Map descriptions, final String relativePath, final File location) { final File icon; @@ -676,10 +678,10 @@ } else { executable = new File(location, EXECUTABLE_UNIX); } - + final String name = names.get(new Locale(StringUtils.EMPTY_STRING)); final FileShortcut shortcut = new FileShortcut(name, executable); - - shortcut.setDescription(description); + shortcut.setNames(names); + shortcut.setDescriptions(descriptions); shortcut.setCategories(SHORTCUT_CATEGORIES); shortcut.setFileName(SHORTCUT_FILENAME); shortcut.setIcon(icon); diff --git a/installer/infra/build/build.xml b/installer/infra/build/build.xml --- a/installer/infra/build/build.xml +++ b/installer/infra/build/build.xml @@ -793,7 +793,7 @@ - + @@ -1385,7 +1385,7 @@ - + @@ -1408,7 +1408,7 @@ - + @@ -1433,7 +1433,7 @@ - + diff --git a/installer/infra/build/web/bundles.list b/installer/infra/build/web/bundles.list --- a/installer/infra/build/web/bundles.list +++ b/installer/infra/build/web/bundles.list @@ -4,6 +4,6 @@ ruby=nb-base, nb-webcommon, nb-ruby, glassfish-mod-sun cpp=nb-base, nb-cnd php=nb-base, nb-webcommon, nb-php -all=nb-base, nb-webcommon, nb-javase, nb-javaee, nb-javame, nb-cnd, nb-ruby, nb-groovy, nb-php, nb-ergonomics, sjsas, glassfish-mod-sun, openesb, tomcat -hidden=openesb, nb-base, nb-webcommon, nb-ergonomics +all=nb-base, nb-webcommon, nb-javase, nb-javaee, nb-javame, nb-cnd, nb-ruby, nb-groovy, nb-php, nb-ergonomics, sjsas, glassfish-mod-sun, tomcat +hidden=nb-base, nb-webcommon, nb-ergonomics diff --git a/installer/infra/build/web/js/build_info.js b/installer/infra/build/web/js/build_info.js --- a/installer/infra/build/web/js/build_info.js +++ b/installer/infra/build/web/js/build_info.js @@ -45,7 +45,7 @@ build_info.BOUNCER_PRODUCT_PREFIX = "{nb.bundle.files.prefix}"; build_info.COMMUNITY_BUILD = "{community.mlbuild}"; -build_info.SHOW_ADDITIONAL_LANGUAGES = "{enable.languages.redirect}"; +build_info.SHOW_ADDITIONAL_LANGUAGES = 0;//"{enable.languages.redirect}"; build_info.ADDITIONAL_BUILD_LOCATION = "{alternative.languages.page.url}"; diff --git a/installer/infra/build/web/js/start.js b/installer/infra/build/web/js/start.js --- a/installer/infra/build/web/js/start.js +++ b/installer/infra/build/web/js/start.js @@ -163,7 +163,7 @@ } } } - if(lang_id=="") lang_id = "en"; + if(lang_id=="") lang_id = get_language_id(); if(option_id != "" && platform_id != "") { if (useBouncer(lang_id) == 1) { diff --git a/installer/mac/newbuild/build.xml b/installer/mac/newbuild/build.xml --- a/installer/mac/newbuild/build.xml +++ b/installer/mac/newbuild/build.xml @@ -66,7 +66,7 @@ - + @@ -214,7 +214,7 @@ - + - + diff --git a/installer/mac/newbuild/dmg/distribution.dist b/installer/mac/newbuild/dmg/distribution.dist --- a/installer/mac/newbuild/dmg/distribution.dist +++ b/installer/mac/newbuild/dmg/distribution.dist @@ -121,7 +121,7 @@ - + @@ -132,9 +132,11 @@ + @@ -167,7 +169,7 @@ file:./Contents/Packages/sjsas.pkg file:./Contents/Packages/glassfish-v3-sun.pkg file:./Contents/Packages/tomcat.pkg - file:./Contents/Packages/openesb.pkg + file:./Contents/Packages/baseide.pkg file:./Contents/Packages/javase.pkg file:./Contents/Packages/webcommon.pkg diff --git a/installer/mac/newbuild/glassfish/pkg/scripts/postflight b/installer/mac/newbuild/glassfish/pkg/scripts/postflight --- a/installer/mac/newbuild/glassfish/pkg/scripts/postflight +++ b/installer/mac/newbuild/glassfish/pkg/scripts/postflight @@ -66,6 +66,7 @@ https_port=`getPort 8181` host_name=`getHost` + export JAVA_HOME $ant_bin --noconfig -v -f setup.xml -Dinstall.home="$2" -Dsource="$SERVICE_TAG_SOURCE" -Dadmin.port=$admin_port -Dinstance.port=$instance_port -Dorb.port=$orb_port -Dimq.port=$imq_port -Dhttps.port=$https_port #TODO replase admin.host=localhost to admin.host=$host_name in ./samples/common.properties file diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_about.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_about.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_about.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_about.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_create.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_create.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_create.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_create.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_edit_dd.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_edit_dd.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_edit_dd.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_edit_dd.html @@ -1,7 +1,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_process.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_process.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_process.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_process.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_quickref.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_quickref.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_quickref.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_quickref.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_compiling.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_compiling.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_compiling.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_compiling.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_documenting.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_documenting.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_documenting.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_documenting.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_libraries.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_libraries.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_libraries.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_libraries.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_packaging.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_packaging.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_packaging.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_packaging.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_run.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_run.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_run.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_run.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_sources.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_sources.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_sources.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_sources.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_wsclient.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_wsclient.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_wsclient.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_wsclient.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_wsclient_disabled.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_wsclient_disabled.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_wsclient_disabled.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_wsclient_disabled.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_with_source_wizard1.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_with_source_wizard1.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_with_source_wizard1.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_with_source_wizard1.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_with_source_wizard2.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_with_source_wizard2.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_with_source_wizard2.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_with_source_wizard2.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/new_appclient.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/new_appclient.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/new_appclient.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/new_appclient.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/new_appclient_server.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/new_appclient_server.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/new_appclient_server.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/new_appclient_server.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/archiveproject-deploying.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/archiveproject-deploying.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/archiveproject-deploying.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/archiveproject-deploying.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/archiveproject_about.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/archiveproject_about.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/archiveproject_about.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/archiveproject_about.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/csh/archiveproject-properties-run.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/csh/archiveproject-properties-run.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/csh/archiveproject-properties-run.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/csh/archiveproject-properties-run.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/csh/archiveproject_new_wizard.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/csh/archiveproject_new_wizard.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/csh/archiveproject_new_wizard.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/csh/archiveproject_new_wizard.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/credits.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/credits.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/credits.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/about_ejb_relationship.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/about_ejb_relationship.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/about_ejb_relationship.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/about_ejb_relationship.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/config_ejb_about.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/config_ejb_about.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/config_ejb_about.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/config_ejb_about.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/config_ejb_dd.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/config_ejb_dd.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/config_ejb_dd.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/config_ejb_dd.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/ejb_relationship.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/ejb_relationship.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/ejb_relationship.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/ejb_relationship.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/call_ejb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/call_ejb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/call_ejb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/call_ejb.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_generate_cmp1.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_generate_cmp1.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_generate_cmp1.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_generate_cmp1.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_generate_cmp2.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_generate_cmp2.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_generate_cmp2.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_generate_cmp2.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_entity.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_entity.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_entity.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_entity.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb_destination.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb_destination.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb_destination.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb_destination.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb_ee5.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb_ee5.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb_ee5.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb_ee5.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_session.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_session.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_session.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_session.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_wizard.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_wizard.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_wizard.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_wizard.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_wizard_server.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_wizard_server.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_wizard_server.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_wizard_server.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_with_source_wizard1.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_with_source_wizard1.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_with_source_wizard1.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_with_source_wizard1.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_with_source_wizard2.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_with_source_wizard2.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_with_source_wizard2.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_with_source_wizard2.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Entity.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Entity.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Entity.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Entity.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_MDB.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_MDB.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_MDB.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_MDB.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Relationship.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Relationship.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Relationship.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Relationship.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Session.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Session.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Session.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Session.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanDetails.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanDetails.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanDetails.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanDetails.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanEnviornment.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanEnviornment.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanEnviornment.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanEnviornment.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanImp.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanImp.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanImp.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanImp.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanSecurity.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanSecurity.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanSecurity.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanSecurity.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_moduleDetails.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_moduleDetails.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_moduleDetails.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_moduleDetails.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_securityRoles.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_securityRoles.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_securityRoles.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_securityRoles.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-add-library.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-add-library.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-add-library.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-add-library.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-compile.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-compile.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-compile.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-compile.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-javadoc.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-javadoc.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-javadoc.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-javadoc.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-libraries.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-libraries.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-libraries.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-libraries.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-packaging.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-packaging.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-packaging.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-packaging.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-run.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-run.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-run.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-run.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-sources.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-sources.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-sources.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-sources.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-webservices-disabled.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-webservices-disabled.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-webservices-disabled.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-webservices-disabled.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-webservices.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-webservices.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-webservices.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-webservices.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/debug_ejb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/debug_ejb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/debug_ejb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/debug_ejb.html @@ -1,7 +1,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/profile_ejb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/profile_ejb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/profile_ejb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/profile_ejb.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/test_ejb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/test_ejb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/test_ejb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/test_ejb.html @@ -1,7 +1,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/deploy/build_ejb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/deploy/build_ejb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/deploy/build_ejb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/deploy/build_ejb.html @@ -1,7 +1,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/deploy/deploy_ejb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/deploy/deploy_ejb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/deploy/deploy_ejb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/deploy/deploy_ejb.html @@ -1,7 +1,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/about_business_method.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/about_business_method.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/about_business_method.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/about_business_method.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/about_call_ejb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/about_call_ejb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/about_call_ejb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/about_call_ejb.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/add_ejbql.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/add_ejbql.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/add_ejbql.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/add_ejbql.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/call_ejb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/call_ejb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/call_ejb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/call_ejb.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/create_ejb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/create_ejb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/create_ejb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/create_ejb.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/create_ejb_project.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/create_ejb_project.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/create_ejb_project.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/create_ejb_project.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_business_method.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_business_method.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_business_method.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_business_method.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_cmp_field.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_cmp_field.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_cmp_field.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_cmp_field.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_finder_method.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_finder_method.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_finder_method.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_finder_method.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_select_method.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_select_method.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_select_method.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_select_method.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/generate_cmp_beans.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/generate_cmp_beans.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/generate_cmp_beans.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/generate_cmp_beans.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/refactor_ejb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/refactor_ejb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/refactor_ejb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/refactor_ejb.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_cmp.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_cmp.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_cmp.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_cmp.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_deployment_descriptors.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_deployment_descriptors.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_deployment_descriptors.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_deployment_descriptors.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_ejbs.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_ejbs.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_ejbs.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_ejbs.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_entity_beans.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_entity_beans.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_entity_beans.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_entity_beans.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_msg_driven_beans.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_msg_driven_beans.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_msg_driven_beans.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_msg_driven_beans.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_session_beans.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_session_beans.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_session_beans.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_session_beans.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/ejb_process.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/ejb_process.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/ejb_process.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/ejb_process.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/ejb_quickref.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/ejb_quickref.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/ejb_quickref.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/ejb_quickref.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/entity_quickref.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/entity_quickref.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/entity_quickref.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/entity_quickref.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschemadef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschemadef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschemadef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschemadef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschemanamedef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschemanamedef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschemanamedef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschemanamedef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschematypedef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschematypedef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschematypedef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschematypedef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/deploymentdesc.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/deploymentdesc.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/deploymentdesc.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/deploymentdesc.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/eisdef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/eisdef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/eisdef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/eisdef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejbcntnrdef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejbcntnrdef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejbcntnrdef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejbcntnrdef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejblocalrefdef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejblocalrefdef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejblocalrefdef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejblocalrefdef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejbrefdef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejbrefdef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejbrefdef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejbrefdef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/enventrydef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/enventrydef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/enventrydef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/enventrydef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/j2eeappdef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/j2eeappdef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/j2eeappdef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/j2eeappdef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/j2eesrvdef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/j2eesrvdef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/j2eesrvdef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/j2eesrvdef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/jarfiledef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/jarfiledef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/jarfiledef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/jarfiledef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/navigationdef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/navigationdef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/navigationdef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/navigationdef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/persistentfielddef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/persistentfielddef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/persistentfielddef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/persistentfielddef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/primarykeyfield.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/primarykeyfield.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/primarykeyfield.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/primarykeyfield.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/relationshipfielddef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/relationshipfielddef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/relationshipfielddef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/relationshipfielddef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/resourceenvironmentref.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/resourceenvironmentref.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/resourceenvironmentref.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/resourceenvironmentref.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/resourcefactoryref.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/resourcefactoryref.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/resourcefactoryref.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/resourcefactoryref.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/securityroleref.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/securityroleref.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/securityroleref.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/securityroleref.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerGeneral.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerGeneral.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerGeneral.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerGeneral.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerJarContent.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerJarContent.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerJarContent.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerJarContent.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerLibraries.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerLibraries.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerLibraries.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerLibraries.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerRun.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerRun.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerRun.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerRun.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator2.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator2.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator2.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator2.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator_servers.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator_servers.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator_servers.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator_servers.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/NewEarProjectWizardIterator.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/NewEarProjectWizardIterator.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/NewEarProjectWizardIterator.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/NewEarProjectWizardIterator.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/NewEarProjectWizardIterator_servers.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/NewEarProjectWizardIterator_servers.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/NewEarProjectWizardIterator_servers.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/NewEarProjectWizardIterator_servers.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/send_email.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/send_email.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/send_email.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/send_email.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/send_jms.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/send_jms.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/send_jms.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/send_jms.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/use_db.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/use_db.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/use_db.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/use_db.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/about_ent_apps.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/about_ent_apps.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/about_ent_apps.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/about_ent_apps.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/add_modules_to_ent_app.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/add_modules_to_ent_app.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/add_modules_to_ent_app.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/add_modules_to_ent_app.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/add_resources_to_ent_app.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/add_resources_to_ent_app.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/add_resources_to_ent_app.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/add_resources_to_ent_app.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_build.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_build.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_build.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_build.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_configure.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_configure.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_configure.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_configure.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_creating.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_creating.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_creating.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_creating.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_deploy.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_deploy.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_deploy.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_deploy.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_process.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_process.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_process.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_process.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_quickref.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_quickref.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_quickref.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_quickref.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_verify.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_verify.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_verify.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_verify.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/send_email.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/send_email.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/send_email.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/send_email.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/send_jms.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/send_jms.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/send_jms.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/send_jms.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/service_locator.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/service_locator.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/service_locator.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/service_locator.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/use_db.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/use_db.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/use_db.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/use_db.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/j2ee-toc.xml b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/j2ee-toc.xml --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/j2ee-toc.xml +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/j2ee-toc.xml @@ -1,7 +1,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/j2ee.hs b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/j2ee.hs --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/j2ee.hs +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/j2ee.hs @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/csh/persist_new_sessionfromentity1.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/csh/persist_new_sessionfromentity1.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/csh/persist_new_sessionfromentity1.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/csh/persist_new_sessionfromentity1.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/csh/persist_new_sessionfromentity2.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/csh/persist_new_sessionfromentity2.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/csh/persist_new_sessionfromentity2.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/csh/persist_new_sessionfromentity2.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/general/persistence_sessionfromentity.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/general/persistence_sessionfromentity.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/general/persistence_sessionfromentity.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/general/persistence_sessionfromentity.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/general/persistence_webapp.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/general/persistence_webapp.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/general/persistence_webapp.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/general/persistence_webapp.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/about_server.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/about_server.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/about_server.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/about_server.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/csh_server_manager.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/csh_server_manager.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/csh_server_manager.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/csh_server_manager.html @@ -1,7 +1,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/about_jboss.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/about_jboss.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/about_jboss.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/about_jboss.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/datasource_app_server_jboss.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/datasource_app_server_jboss.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/datasource_app_server_jboss.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/datasource_app_server_jboss.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_location_csh.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_location_csh.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_location_csh.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_location_csh.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_process.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_process.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_process.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_process.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_properties_csh.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_properties_csh.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_properties_csh.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_properties_csh.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_quickref.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_quickref.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_quickref.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_quickref.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/management_console_app_server_jboss.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/management_console_app_server_jboss.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/management_console_app_server_jboss.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/management_console_app_server_jboss.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/registering_app_server_jboss.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/registering_app_server_jboss.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/registering_app_server_jboss.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/registering_app_server_jboss.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_aboutdbconnect.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_aboutdbconnect.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_aboutdbconnect.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_aboutdbconnect.html @@ -3,7 +3,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_register.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_register.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_register.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_register.html @@ -1,7 +1,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_remove.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_remove.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_remove.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_remove.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_start.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_start.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_start.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_start.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/weblogic/weblogic_location_csh.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/weblogic/weblogic_location_csh.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/weblogic/weblogic_location_csh.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/weblogic/weblogic_location_csh.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/weblogic/weblogic_properties_csh.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/weblogic/weblogic_properties_csh.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/weblogic/weblogic_properties_csh.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/weblogic/weblogic_properties_csh.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/tbd.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/tbd.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/tbd.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/tbd.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/web/about_webtier.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/web/about_webtier.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/web/about_webtier.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/web/about_webtier.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/about_rest.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/about_rest.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/about_rest.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/about_rest.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/about_ws.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/about_ws.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/about_ws.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/about_ws.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/ws_process.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/ws_process.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/ws_process.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/ws_process.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/ws_quickref.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/ws_quickref.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/ws_quickref.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/ws_quickref.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/build/about_build_ws.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/build/about_build_ws.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/build/about_build_ws.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/build/about_build_ws.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/about_annotations.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/about_annotations.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/about_annotations.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/about_annotations.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_about.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_about.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_about.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_about.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_annotations.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_annotations.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_annotations.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_annotations.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_dd.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_dd.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_dd.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_dd.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/about_wsc.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/about_wsc.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/about_wsc.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/about_wsc.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_build.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_build.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_build.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_build.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_call_ws.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_call_ws.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_call_ws.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_call_ws.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_call_ws_asynchronous.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_call_ws_asynchronous.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_call_ws_asynchronous.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_call_ws_asynchronous.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_create.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_create.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_create.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_create.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_deploy.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_deploy.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_deploy.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_deploy.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_expose.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_expose.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_expose.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_expose.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_process.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_process.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_process.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_process.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_proxy.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_proxy.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_proxy.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_proxy.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_rest.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_rest.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_rest.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_rest.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_stubs.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_stubs.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_stubs.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_stubs.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/about_implement_ws.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/about_implement_ws.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/about_implement_ws.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/about_implement_ws.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/add_ws_operation.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/add_ws_operation.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/add_ws_operation.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/add_ws_operation.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_axis.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_axis.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_axis.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_axis.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_rest_from_scratch.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_rest_from_scratch.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_rest_from_scratch.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_rest_from_scratch.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_java.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_java.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_java.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_java.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_scratch.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_scratch.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_scratch.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_scratch.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_wsdl.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_wsdl.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_wsdl.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_wsdl.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_wsdl_file.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_wsdl_file.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_wsdl_file.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_wsdl_file.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/AddWebServiceDlg.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/AddWebServiceDlg.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/AddWebServiceDlg.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/AddWebServiceDlg.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/EditWSAttributesCookieImpl.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/EditWSAttributesCookieImpl.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/EditWSAttributesCookieImpl.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/EditWSAttributesCookieImpl.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_BINDING.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_BINDING.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_BINDING.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_BINDING.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_BINDING_OPERATION.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_BINDING_OPERATION.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_BINDING_OPERATION.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_BINDING_OPERATION.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_EXTERNAL_BINDING.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_EXTERNAL_BINDING.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_EXTERNAL_BINDING.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_EXTERNAL_BINDING.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_GLOBAL.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_GLOBAL.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_GLOBAL.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_GLOBAL.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT_TYPE.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT_TYPE.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT_TYPE.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT_TYPE.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT_TYPE_OPERATION_FAULT.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT_TYPE_OPERATION_FAULT.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT_TYPE_OPERATION_FAULT.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT_TYPE_OPERATION_FAULT.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_SERVICE.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_SERVICE.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_SERVICE.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_SERVICE.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/wsdl_customization.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/wsdl_customization.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/wsdl_customization.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/wsdl_customization.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/LogicalHandlerWizard.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/LogicalHandlerWizard.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/LogicalHandlerWizard.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/LogicalHandlerWizard.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/MessageHandlerWizard.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/MessageHandlerWizard.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/MessageHandlerWizard.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/MessageHandlerWizard.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceClientWizardDescriptor.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceClientWizardDescriptor.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceClientWizardDescriptor.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceClientWizardDescriptor.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceWizardDescriptor.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceWizardDescriptor.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceWizardDescriptor.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceWizardDescriptor.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceWizardFromWSDLDescriptor.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceWizardFromWSDLDescriptor.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceWizardFromWSDLDescriptor.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceWizardFromWSDLDescriptor.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WsdlPanel.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WsdlPanel.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WsdlPanel.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WsdlPanel.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/about_deploy_and_test_ws.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/about_deploy_and_test_ws.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/about_deploy_and_test_ws.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/about_deploy_and_test_ws.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/as_setup_axis.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/as_setup_axis.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/as_setup_axis.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/as_setup_axis.html @@ -1,4 +1,4 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/deploy_axis.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/deploy_axis.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/deploy_axis.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/deploy_axis.html @@ -1,4 +1,4 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/deploy_test_axis.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/deploy_test_axis.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/deploy_test_axis.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/deploy_test_axis.html @@ -1,4 +1,4 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/expose_ws.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/expose_ws.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/expose_ws.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/expose_ws.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/glassfish_tester-ws.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/glassfish_tester-ws.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/glassfish_tester-ws.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/glassfish_tester-ws.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_axis.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_axis.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_axis.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_axis.html @@ -1,4 +1,4 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_rest.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_rest.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_rest.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_rest.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_ws.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_ws.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_ws.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_ws.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/about_jaxb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/about_jaxb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/about_jaxb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/about_jaxb.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/jaxb_wizard.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/jaxb_wizard.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/jaxb_wizard.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/jaxb_wizard.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/marshall_unmarshall.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/marshall_unmarshall.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/marshall_unmarshall.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/marshall_unmarshall.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/unmarshall_marshall.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/unmarshall_marshall.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/unmarshall_marshall.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/unmarshall_marshall.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/about_ws_soap_message.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/about_ws_soap_message.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/about_ws_soap_message.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/about_ws_soap_message.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/configure_ws_soap_message.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/configure_ws_soap_message.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/configure_ws_soap_message.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/configure_ws_soap_message.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/create_ws_soap_message.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/create_ws_soap_message.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/create_ws_soap_message.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/create_ws_soap_message.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/test_and_use_ws_soap_message.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/test_and_use_ws_soap_message.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/test_and_use_ws_soap_message.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/test_and_use_ws_soap_message.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-BindingInputNode.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-BindingInputNode.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-BindingInputNode.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-BindingInputNode.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-BindingOutputNode.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-BindingOutputNode.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-BindingOutputNode.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-BindingOutputNode.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-EditWSAttributesCookieImpl.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-EditWSAttributesCookieImpl.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-EditWSAttributesCookieImpl.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-EditWSAttributesCookieImpl.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-OperationContainerServiceNode.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-OperationContainerServiceNode.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-OperationContainerServiceNode.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-OperationContainerServiceNode.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-OperationNode.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-OperationNode.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-OperationNode.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-OperationNode.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-ServiceNode.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-ServiceNode.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-ServiceNode.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-ServiceNode.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-TransportClientNode.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-TransportClientNode.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-TransportClientNode.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-TransportClientNode.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-UserAuthenticationNode.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-UserAuthenticationNode.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-UserAuthenticationNode.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-UserAuthenticationNode.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-about.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-about.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-about.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-about.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-access.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-access.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-access.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-access.html @@ -1,6 +1,6 @@ diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appclientconfigeditors/sun-application-client.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appclientconfigeditors/sun-application-client.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appclientconfigeditors/sun-application-client.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appclientconfigeditors/sun-application-client.html @@ -3,7 +3,7 @@ sun-application-client.xml Visual Editor: General diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appclientconfigeditors/sun-applicationclient_env.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appclientconfigeditors/sun-applicationclient_env.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appclientconfigeditors/sun-applicationclient_env.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appclientconfigeditors/sun-applicationclient_env.html @@ -3,7 +3,7 @@ Deployment Descriptor Visual Editor: Environment diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appconfigeditors/sunapplication.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appconfigeditors/sunapplication.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appconfigeditors/sunapplication.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appconfigeditors/sunapplication.html @@ -3,7 +3,7 @@ sun-application.xml Visual Editor diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/gen_tables.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/gen_tables.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/gen_tables.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/gen_tables.html @@ -2,7 +2,7 @@ diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/map_bean_to_db.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/map_bean_to_db.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/map_bean_to_db.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/map_bean_to_db.html @@ -2,7 +2,7 @@ diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/map_rel_fields.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/map_rel_fields.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/map_rel_fields.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/map_rel_fields.html @@ -2,7 +2,7 @@ diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/ChangeDocType.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/ChangeDocType.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/ChangeDocType.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/ChangeDocType.html @@ -3,7 +3,7 @@ Change Configuration Version Dialog Box diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebAddGroup.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebAddGroup.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebAddGroup.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebAddGroup.html @@ -3,7 +3,7 @@ Visual Editor: Add Group Dialog Box diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebAddPrincipal.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebAddPrincipal.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebAddPrincipal.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebAddPrincipal.html @@ -3,7 +3,7 @@ Visual Editor: Add Principal Dialog Box diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebEditGroup.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebEditGroup.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebEditGroup.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebEditGroup.html @@ -3,7 +3,7 @@ Visual Editor: Edit Group Dialog Box diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebEditPrincipal.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebEditPrincipal.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebEditPrincipal.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebEditPrincipal.html @@ -3,7 +3,7 @@ Visual Editor: Edit Principal Dialog Box diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebMessageSecBindings.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebMessageSecBindings.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebMessageSecBindings.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebMessageSecBindings.html @@ -3,7 +3,7 @@ Visual Editor: Message Security Bindings Dialog Box diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebMessageSecurity.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebMessageSecurity.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebMessageSecurity.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebMessageSecurity.html @@ -3,7 +3,7 @@ Visual Editor: Message Security Dialog Box diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebRoleMapping.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebRoleMapping.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebRoleMapping.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebRoleMapping.html @@ -3,7 +3,7 @@ Deployment Descriptor Visual Editor: Security diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/ServiceRefPortInfoStubProperty.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/ServiceRefPortInfoStubProperty.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/ServiceRefPortInfoStubProperty.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/ServiceRefPortInfoStubProperty.html @@ -3,7 +3,7 @@ Service Reference Port Information: Stub Property Editor diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/Servlet.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/Servlet.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/Servlet.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/Servlet.html @@ -3,7 +3,7 @@ Deployment Descriptor Visual Editor: Servlets diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebAppGeneral.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebAppGeneral.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebAppGeneral.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebAppGeneral.html @@ -5,7 +5,7 @@ Deployment Descriptor Visual Editor: Messaging diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebserviceClients.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebserviceClients.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebserviceClients.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebserviceClients.html @@ -3,7 +3,7 @@ Deployment Descriptor Visual Editor: Web Service Clients diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebserviceDescriptor.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebserviceDescriptor.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebserviceDescriptor.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebserviceDescriptor.html @@ -3,7 +3,7 @@ Deployment Descriptor Visual Editor: Web Services diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/credits.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/credits.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/credits.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/ejbconfigeditors/entitybean.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/ejbconfigeditors/entitybean.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/ejbconfigeditors/entitybean.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/ejbconfigeditors/entitybean.html @@ -7,7 +7,7 @@ diff --git a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/credits.html b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/credits.html --- a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/credits.html +++ b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-idx.xml b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-idx.xml --- a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-idx.xml +++ b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-idx.xml @@ -1,6 +1,6 @@ diff --git a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-map.jhm b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-map.jhm --- a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-map.jhm +++ b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-map.jhm @@ -2,7 +2,7 @@ diff --git a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-toc.xml b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-toc.xml --- a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-toc.xml +++ b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-toc.xml @@ -2,7 +2,7 @@ diff --git a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere_property_sheet_server_node.html b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere_property_sheet_server_node.html --- a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere_property_sheet_server_node.html +++ b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere_property_sheet_server_node.html @@ -1,6 +1,6 @@ diff --git a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere_registering_app_server.html b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere_registering_app_server.html --- a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere_registering_app_server.html +++ b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere_registering_app_server.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_debugging.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_debugging.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_debugging.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_debugging.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_docs.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_docs.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_docs.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_docs.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_editing.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_editing.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_editing.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_editing.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_intro.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_intro.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_intro.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_intro.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_optional-tasks.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_optional-tasks.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_optional-tasks.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_optional-tasks.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_running.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_running.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_running.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_running.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_settings.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_settings.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_settings.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_settings.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_shortcut.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_shortcut.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_shortcut.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_shortcut.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_tasks-classpath.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_tasks-classpath.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_tasks-classpath.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_tasks-classpath.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_version.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_version.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_version.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_version.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/exp-classpath.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/exp-classpath.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/exp-classpath.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/exp-classpath.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_dependencies.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_dependencies.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_dependencies.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_dependencies.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_file.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_file.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_file.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_file.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_jar.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_jar.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_jar.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_jar.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_libraries.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_libraries.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_libraries.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_libraries.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_output.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_output.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_output.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_output.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_quickref.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_quickref.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_quickref.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_quickref.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/configure/options_ant.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/configure/options_ant.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/configure/options_ant.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/configure/options_ant.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/configure/options_form.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/configure/options_form.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/configure/options_form.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/configure/options_form.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/credits.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/credits.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/credits.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_class.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_class.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_class.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_class.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_exception.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_exception.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_exception.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_exception.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_line.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_line.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_line.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_line.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_method.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_method.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_method.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_method.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_thread.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_thread.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_thread.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_thread.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_variable.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_variable.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_variable.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_variable.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_view.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_view.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_view.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_view.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_window.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_window.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_window.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_window.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/callstack_view.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/callstack_view.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/callstack_view.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/callstack_view.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/classes_view.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/classes_view.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/classes_view.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/classes_view.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_options.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_options.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_options.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_options.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_output.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_output.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_output.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_output.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_window.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_window.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_window.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_window.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/evaluate_expression.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/evaluate_expression.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/evaluate_expression.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/evaluate_expression.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/instances_view.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/instances_view.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/instances_view.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/instances_view.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/old_stack_call.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/old_stack_call.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/old_stack_call.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/old_stack_call.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/sessions_view.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/sessions_view.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/sessions_view.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/sessions_view.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/sources_view.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/sources_view.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/sources_view.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/sources_view.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/threads_view.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/threads_view.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/threads_view.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/threads_view.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/variables_view.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/variables_view.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/variables_view.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/variables_view.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/watch_window.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/watch_window.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/watch_window.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/watch_window.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/watches_view.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/watches_view.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/watches_view.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/watches_view.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_conditional.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_conditional.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_conditional.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_conditional.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_group.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_group.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_group.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_group.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_setting.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_setting.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_setting.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_setting.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_callstack.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_callstack.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_callstack.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_callstack.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_context.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_context.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_context.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_context.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_customize_views.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_customize_views.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_customize_views.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_customize_views.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_debuggingwindow.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_debuggingwindow.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_debuggingwindow.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_debuggingwindow.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_expression.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_expression.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_expression.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_expression.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_expressionstep.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_expressionstep.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_expressionstep.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_expressionstep.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_finish.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_finish.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_finish.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_finish.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_fix.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_fix.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_fix.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_fix.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_fix_watch.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_fix_watch.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_fix_watch.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_fix_watch.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_local.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_local.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_local.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_local.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_new_watch.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_new_watch.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_new_watch.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_new_watch.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_print_breakpoint_message.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_print_breakpoint_message.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_print_breakpoint_message.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_print_breakpoint_message.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_process.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_process.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_process.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_process.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_quickref.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_quickref.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_quickref.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_quickref.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_remote.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_remote.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_remote.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_remote.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_source.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_source.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_source.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_source.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_step.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_step.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_step.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_step.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_syntaxrules_breakpointconditions.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_syntaxrules_breakpointconditions.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_syntaxrules_breakpointconditions.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_syntaxrules_breakpointconditions.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_threads.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_threads.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_threads.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_threads.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_variables.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_variables.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_variables.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_variables.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/abbreviations-list.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/abbreviations-list.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/abbreviations-list.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/abbreviations-list.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/about_source_editor.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/about_source_editor.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/about_source_editor.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/about_source_editor.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/editor_glyphs.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/editor_glyphs.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/editor_glyphs.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/editor_glyphs.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/import_class_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/import_class_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/import_class_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/import_class_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/java_editor_toolbar.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/java_editor_toolbar.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/java_editor_toolbar.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/java_editor_toolbar.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/nav_window.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/nav_window.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/nav_window.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/nav_window.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/editor_navigation.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/editor_navigation.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/editor_navigation.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/editor_navigation.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/editor_template_syntax.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/editor_template_syntax.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/editor_template_syntax.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/editor_template_syntax.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/java-editorcuts.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/java-editorcuts.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/java-editorcuts.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/java-editorcuts.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/tasks_viewing.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/tasks_viewing.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/tasks_viewing.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/tasks_viewing.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_edit.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_edit.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_edit.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_edit.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_enable.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_enable.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_enable.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_enable.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_intro.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_intro.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_intro.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_intro.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_advanced_sourcemod_dialog.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_advanced_sourcemod_dialog.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_advanced_sourcemod_dialog.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_advanced_sourcemod_dialog.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_bind_advanced_dialog.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_bind_advanced_dialog.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_bind_advanced_dialog.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_bind_advanced_dialog.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_bind_dialog.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_bind_dialog.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_bind_dialog.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_bind_dialog.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_connection_wizard.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_connection_wizard.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_connection_wizard.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_connection_wizard.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_customizecode_dialog.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_customizecode_dialog.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_customizecode_dialog.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_customizecode_dialog.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_event_handler_dialog.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_event_handler_dialog.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_event_handler_dialog.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_event_handler_dialog.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_gridbag_customizer.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_gridbag_customizer.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_gridbag_customizer.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_gridbag_customizer.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_guibuilder_window.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_guibuilder_window.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_guibuilder_window.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_guibuilder_window.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_inspector_window.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_inspector_window.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_inspector_window.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_inspector_window.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_modifiers_editor.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_modifiers_editor.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_modifiers_editor.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_modifiers_editor.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_palette_window.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_palette_window.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_palette_window.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_palette_window.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_preview_window.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_preview_window.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_preview_window.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_preview_window.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_accessibleform.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_accessibleform.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_accessibleform.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_accessibleform.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_addcomponent.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_addcomponent.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_addcomponent.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_addcomponent.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_addingtopalette.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_addingtopalette.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_addingtopalette.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_addingtopalette.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_converters.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_converters.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_converters.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_converters.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_data.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_data.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_data.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_data.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_db_working.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_db_working.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_db_working.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_db_working.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_properties.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_properties.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_properties.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_properties.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_synthetic.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_synthetic.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_synthetic.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_synthetic.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_validators.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_validators.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_validators.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_validators.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_working.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_working.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_working.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_working.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_component_align.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_component_align.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_component_align.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_component_align.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_component_size.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_component_size.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_component_size.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_component_size.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_configuring.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_configuring.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_configuring.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_configuring.html @@ -3,7 +3,7 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_containers.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_containers.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_containers.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_containers.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_creatingforms.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_creatingforms.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_creatingforms.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_creatingforms.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_creatingmdi.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_creatingmdi.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_creatingmdi.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_creatingmdi.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_deploying.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_deploying.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_deploying.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_deploying.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_designing.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_designing.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_designing.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_designing.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_editcomponentprops.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_editcomponentprops.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_editcomponentprops.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_editcomponentprops.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_events_managing.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_events_managing.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_events_managing.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_events_managing.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_events_setting.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_events_setting.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_events_setting.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_events_setting.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_modifysource.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_modifysource.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_modifysource.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_modifysource.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_overview.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_overview.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_overview.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_overview.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_previewing.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_previewing.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_previewing.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_previewing.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_quickref.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_quickref.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_quickref.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_quickref.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_selectcomponents.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_selectcomponents.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_selectcomponents.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_selectcomponents.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_customlayout.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_customlayout.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_customlayout.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_customlayout.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_gbcustomizer.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_gbcustomizer.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_gbcustomizer.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_gbcustomizer.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_layoutmanagers.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_layoutmanagers.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_layoutmanagers.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_layoutmanagers.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_layoutprops.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_layoutprops.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_layoutprops.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_layoutprops.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_settinglayout.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_settinglayout.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_settinglayout.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_settinglayout.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_action_csh.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_action_csh.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_action_csh.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_action_csh.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_actions.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_actions.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_actions.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_actions.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_creating.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_creating.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_creating.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_creating.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_resources.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_resources.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_resources.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_resources.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_working.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_working.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_working.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_working.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/csh/hibernate_fromdbwiz_codegen.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/csh/hibernate_fromdbwiz_codegen.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/csh/hibernate_fromdbwiz_codegen.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/csh/hibernate_fromdbwiz_codegen.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_addsupport.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_addsupport.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_addsupport.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_addsupport.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_cfg.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_cfg.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_cfg.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_cfg.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_cfgedit.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_cfgedit.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_cfgedit.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_cfgedit.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_fromdb.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_fromdb.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_fromdb.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_fromdb.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_hql.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_hql.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_hql.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_hql.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_mapping.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_mapping.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_mapping.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_mapping.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_reveng.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_reveng.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_reveng.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_reveng.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_util.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_util.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_util.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_util.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_workingwith.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_workingwith.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_workingwith.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_workingwith.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/addparams.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/addparams.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/addparams.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/addparams.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/autoinsert.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/autoinsert.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/autoinsert.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/autoinsert.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/bundleformat.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/bundleformat.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/bundleformat.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/bundleformat.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/formedstrings.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/formedstrings.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/formedstrings.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/formedstrings.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18n_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18n_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18n_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18n_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18n_automatic.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18n_automatic.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18n_automatic.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18n_automatic.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18ncodeformat.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18ncodeformat.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18ncodeformat.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18ncodeformat.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18nwizard.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18nwizard.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18nwizard.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18nwizard.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/international.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/international.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/international.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/international.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/manualinsert.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/manualinsert.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/manualinsert.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/manualinsert.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/replacingformat.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/replacingformat.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/replacingformat.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/replacingformat.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/testingwizard.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/testingwizard.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/testingwizard.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/testingwizard.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/java.hs b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/java.hs --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/java.hs +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/java.hs @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/generate.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/generate.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/generate.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/generate.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/search_window.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/search_window.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/search_window.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/search_window.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/show_in_editor.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/show_in_editor.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/show_in_editor.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/show_in_editor.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_configuring.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_configuring.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_configuring.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_configuring.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_creatingtests.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_creatingtests.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_creatingtests.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_creatingtests.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_chooseversion.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_chooseversion.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_chooseversion.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_chooseversion.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_creatingtests.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_creatingtests.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_creatingtests.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_creatingtests.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_emptytest.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_emptytest.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_emptytest.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_emptytest.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_simpletest.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_simpletest.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_simpletest.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_simpletest.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_testsuite.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_testsuite.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_testsuite.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_testsuite.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_debuggingtests.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_debuggingtests.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_debuggingtests.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_debuggingtests.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_overview.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_overview.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_overview.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_overview.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_quickref.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_quickref.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_quickref.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_quickref.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_resultswindow.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_resultswindow.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_resultswindow.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_resultswindow.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_runningtests.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_runningtests.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_runningtests.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_runningtests.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/pending.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/pending.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/pending.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/pending.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/db_persist_addentityclass.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/db_persist_addentityclass.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/db_persist_addentityclass.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/db_persist_addentityclass.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/glossary_persist_context.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/glossary_persist_context.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/glossary_persist_context.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/glossary_persist_context.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_editor_persistenceunit.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_editor_persistenceunit.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_editor_persistenceunit.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_editor_persistenceunit.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db1.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db1.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db1.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db1.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db2.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db2.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db2.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db2.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db3.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db3.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db3.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db3.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_persistenceunit.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_persistenceunit.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_persistenceunit.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_persistenceunit.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persist_jpa_fromentity.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persist_jpa_fromentity.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persist_jpa_fromentity.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persist_jpa_fromentity.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_aboutentitymanager.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_aboutentitymanager.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_aboutentitymanager.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_aboutentitymanager.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_aboutunit.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_aboutunit.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_aboutunit.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_aboutunit.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_entityclasses.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_entityclasses.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_entityclasses.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_entityclasses.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_entitymanager.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_entitymanager.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_entitymanager.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_entitymanager.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_fromdb.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_fromdb.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_fromdb.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_fromdb.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_mapping.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_mapping.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_mapping.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_mapping.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_quickref.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_quickref.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_quickref.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_quickref.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_support.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_support.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_support.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_support.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_unit.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_unit.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_unit.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_unit.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/profiling/profile_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/profiling/profile_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/profiling/profile_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/profiling/profile_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/files_window.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/files_window.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/files_window.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/files_window.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/glossary_freeform.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/glossary_freeform.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/glossary_freeform.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/glossary_freeform.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/glossary_standard.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/glossary_standard.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/glossary_standard.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/glossary_standard.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz1.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz1.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz1.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz1.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz2.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz2.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz2.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz2.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-standapp_wiz.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-standapp_wiz.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-standapp_wiz.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-standapp_wiz.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-standclasslib_wiz.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-standclasslib_wiz.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-standclasslib_wiz.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-standclasslib_wiz.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz1.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz1.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz1.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz1.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz2.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz2.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz2.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz2.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz3.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz3.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz3.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz3.html @@ -1,7 +1,7 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_buildrun.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_buildrun.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_buildrun.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_buildrun.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_classpath.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_classpath.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_classpath.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_classpath.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_output.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_output.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_output.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_output.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_sources.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_sources.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_sources.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_sources.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz1.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz1.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz1.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz1.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz2.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz2.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz2.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz2.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz3.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz3.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz3.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz3.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz4.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz4.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz4.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz4.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz5.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz5.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz5.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz5.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_common-app.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_common-app.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_common-app.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_common-app.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_compiling.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_compiling.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_compiling.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_compiling.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_desktop-app.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_desktop-app.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_desktop-app.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_desktop-app.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_documenting.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_documenting.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_documenting.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_documenting.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_libraries.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_libraries.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_libraries.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_libraries.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_packaging.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_packaging.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_packaging.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_packaging.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_run.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_run.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_run.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_run.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_sources.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_sources.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_sources.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_sources.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_webstart.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_webstart.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_webstart.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_webstart.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_wsclient.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_wsclient.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_wsclient.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_wsclient.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_wsclient_disabled.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_wsclient_disabled.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_wsclient_disabled.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_wsclient_disabled.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_new_lib_wiz1.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_new_lib_wiz1.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_new_lib_wiz1.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_new_lib_wiz1.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_new_lib_wiz2.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_new_lib_wiz2.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_new_lib_wiz2.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_new_lib_wiz2.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_platform_manager.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_platform_manager.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_platform_manager.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_platform_manager.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_templates.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_templates.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_templates.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_templates.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_window.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_window.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_window.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_window.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_creating.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_creating.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_creating.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_creating.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_deleting.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_deleting.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_deleting.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_deleting.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_add.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_add.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_add.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_add.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_classpath.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_classpath.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_classpath.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_classpath.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_debug.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_debug.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_debug.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_debug.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_debug_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_debug_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_debug_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_debug_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_nbtargs.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_nbtargs.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_nbtargs.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_nbtargs.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_projectxml.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_projectxml.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_projectxml.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_projectxml.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_targets.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_targets.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_targets.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_targets.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_icons.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_icons.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_icons.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_icons.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_import.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_import.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_import.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_import.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_main.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_main.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_main.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_main.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_move_copy_rename.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_move_copy_rename.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_move_copy_rename.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_move_copy_rename.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_process.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_process.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_process.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_process.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_quickref.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_quickref.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_quickref.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_quickref.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_sharing.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_sharing.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_sharing.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_sharing.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_sources_multi.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_sources_multi.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_sources_multi.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_sources_multi.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_ant_structure.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_ant_structure.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_ant_structure.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_ant_structure.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_customize.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_customize.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_customize.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_customize.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_templates.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_templates.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_templates.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_templates.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_webfree_debug.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_webfree_debug.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_webfree_debug.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_webfree_debug.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/about_resourcebundles.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/about_resourcebundles.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/about_resourcebundles.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/about_resourcebundles.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/addinglocale.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/addinglocale.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/addinglocale.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/addinglocale.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/addingprops.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/addingprops.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/addingprops.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/addingprops.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/creating_resourcebundles.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/creating_resourcebundles.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/creating_resourcebundles.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/creating_resourcebundles.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/editinglocale.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/editinglocale.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/editinglocale.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/editinglocale.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/modifyprops.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/modifyprops.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/modifyprops.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/modifyprops.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/aboutRefactoring.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/aboutRefactoring.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/aboutRefactoring.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/aboutRefactoring.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/changeParameters.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/changeParameters.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/changeParameters.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/changeParameters.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/convertAnonymous.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/convertAnonymous.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/convertAnonymous.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/convertAnonymous.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/copyClass.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/copyClass.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/copyClass.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/copyClass.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/change-method-parameters_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/change-method-parameters_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/change-method-parameters_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/change-method-parameters_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/copy-class_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/copy-class_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/copy-class_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/copy-class_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/encapsulate-fields_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/encapsulate-fields_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/encapsulate-fields_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/encapsulate-fields_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-interface_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-interface_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-interface_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-interface_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-method_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-method_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-method_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-method_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-superclass_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-superclass_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-superclass_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-superclass_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/findUsages-CSH.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/findUsages-CSH.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/findUsages-CSH.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/findUsages-CSH.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/move-class_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/move-class_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/move-class_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/move-class_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/move-inner_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/move-inner_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/move-inner_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/move-inner_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/previewWindow.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/previewWindow.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/previewWindow.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/previewWindow.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/pull-up_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/pull-up_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/pull-up_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/pull-up_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/push-down_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/push-down_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/push-down_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/push-down_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/rename_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/rename_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/rename_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/rename_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/safe-delete_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/safe-delete_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/safe-delete_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/safe-delete_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/usagesWindow.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/usagesWindow.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/usagesWindow.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/usagesWindow.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/use-supertype_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/use-supertype_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/use-supertype_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/use-supertype_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/encapsulateField.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/encapsulateField.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/encapsulateField.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/encapsulateField.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractInterface.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractInterface.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractInterface.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractInterface.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractMethod.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractMethod.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractMethod.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractMethod.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractSuperclass.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractSuperclass.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractSuperclass.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractSuperclass.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/findClass.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/findClass.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/findClass.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/findClass.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/moveClass.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/moveClass.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/moveClass.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/moveClass.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/moveInner.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/moveInner.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/moveInner.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/moveInner.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/pullUp.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/pullUp.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/pullUp.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/pullUp.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/pushDown.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/pushDown.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/pushDown.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/pushDown.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/refactorQuickRef.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/refactorQuickRef.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/refactorQuickRef.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/refactorQuickRef.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/renameClass.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/renameClass.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/renameClass.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/renameClass.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/renameField.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/renameField.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/renameField.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/renameField.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/safeDelete.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/safeDelete.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/safeDelete.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/safeDelete.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/undo.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/undo.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/undo.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/undo.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/useSupertype.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/useSupertype.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/useSupertype.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/useSupertype.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_app.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_app.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_app.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_app.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_args.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_args.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_args.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_args.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_classpath.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_classpath.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_classpath.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_classpath.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_file.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_file.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_file.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_file.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_jvm_args.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_jvm_args.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_jvm_args.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_jvm_args.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_process.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_process.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_process.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_process.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_quickref.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_quickref.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_quickref.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_quickref.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/add-support.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/add-support.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/add-support.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/add-support.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/create-config-file.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/create-config-file.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/create-config-file.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/create-config-file.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/locate-beans.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/locate-beans.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/locate-beans.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/locate-beans.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/organize-files.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/organize-files.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/organize-files.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/organize-files.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/tbd.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/tbd.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/tbd.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/tbd.html @@ -1,6 +1,6 @@ diff --git a/jumpto/src/org/netbeans/modules/jumpto/SearchHistory.java b/jumpto/src/org/netbeans/modules/jumpto/SearchHistory.java --- a/jumpto/src/org/netbeans/modules/jumpto/SearchHistory.java +++ b/jumpto/src/org/netbeans/modules/jumpto/SearchHistory.java @@ -139,6 +139,10 @@ LOGGER.fine("String to store is empty => ignoring."); return; } + if (text.contains(DELIMITER)){ + LOGGER.fine("String to store contain delimeter => ignoring."); + return; + } if (data.remove(text)) { LOGGER.fine(String.format("Text %s already in history, removing and readding.", text)); } diff --git a/maven/javahelp/org/netbeans/modules/maven/docs/credits.html b/maven/javahelp/org/netbeans/modules/maven/docs/credits.html --- a/maven/javahelp/org/netbeans/modules/maven/docs/credits.html +++ b/maven/javahelp/org/netbeans/modules/maven/docs/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-newproj-archetype.html b/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-newproj-archetype.html --- a/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-newproj-archetype.html +++ b/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-newproj-archetype.html @@ -1,6 +1,6 @@ diff --git a/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-newproj-basic.html b/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-newproj-basic.html --- a/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-newproj-basic.html +++ b/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-newproj-basic.html @@ -1,6 +1,6 @@ diff --git a/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-options.html b/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-options.html --- a/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-options.html +++ b/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-options.html @@ -1,6 +1,6 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/credits.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/credits.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/credits.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/credits.html @@ -1,7 +1,7 @@ @@ -14,7 +14,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -37,8 +37,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-clone.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-clone.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-clone.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-clone.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-merge-revs.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-merge-revs.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-merge-revs.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-merge-revs.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-pullother.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-pullother.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-pullother.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-pullother.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-pushother.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-pushother.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-pushother.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-pushother.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-revert-mods.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-revert-mods.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-revert-mods.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-revert-mods.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-update.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-update.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-update.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-update.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-about.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-about.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-about.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-about.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-cloneother.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-cloneother.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-cloneother.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-cloneother.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-diffviewer.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-diffviewer.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-diffviewer.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-diffviewer.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-import.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-import.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-import.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-import.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-options.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-options.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-options.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-options.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-properties.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-properties.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-properties.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-properties.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-quickref.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-quickref.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-quickref.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-quickref.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-setup.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-setup.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-setup.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-setup.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-status.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-status.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-status.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-status.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-statuswindow.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-statuswindow.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-statuswindow.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-statuswindow.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/emulator/emulator_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/emulator/emulator_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/emulator/emulator_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/emulator/emulator_about.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/getstart/welcome.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/getstart/welcome.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/getstart/welcome.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/getstart/welcome.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/project/csh/proj_cdc-standapp_wiz.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/project/csh/proj_cdc-standapp_wiz.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/project/csh/proj_cdc-standapp_wiz.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/project/csh/proj_cdc-standapp_wiz.html @@ -2,7 +2,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/project/project_quickref.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/project/project_quickref.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/project/project_quickref.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/project/project_quickref.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/abilities_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/abilities_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/abilities_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/abilities_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/abilities_add.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/abilities_add.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/abilities_add.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/abilities_add.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_add.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_add.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_add.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_add.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_customizing.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_customizing.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_customizing.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_customizing.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_quickref.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_quickref.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_quickref.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_quickref.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_setdefault.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_setdefault.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_setdefault.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_setdefault.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_templatecreating.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_templatecreating.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_templatecreating.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_templatecreating.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_working.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_working.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_working.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_working.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_comparison.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_comparison.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_comparison.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_comparison.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_manage.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_manage.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_manage.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_manage.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocessor_directives_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocessor_directives_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocessor_directives_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocessor_directives_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/about_deployment.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/about_deployment.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/about_deployment.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/about_deployment.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/about_ota.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/about_ota.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/about_ota.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/about_ota.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_copy.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_copy.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_copy.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_copy.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_deploying.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_deploying.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_deploying.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_deploying.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_devanywhere.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_devanywhere.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_devanywhere.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_devanywhere.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_ftp.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_ftp.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_ftp.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_ftp.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_increment.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_increment.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_increment.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_increment.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_nokia.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_nokia.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_nokia.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_nokia.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_ricoh.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_ricoh.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_ricoh.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_ricoh.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_scp.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_scp.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_scp.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_scp.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_se.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_se.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_se.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_se.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_webdav.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_webdav.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_webdav.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_webdav.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_winmobile.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_winmobile.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_winmobile.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_winmobile.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/emulator/emulator_adding.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/emulator/emulator_adding.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/emulator/emulator_adding.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/emulator/emulator_adding.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/games/games_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/games/games_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/games/games_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/games/games_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/games/games_quickref.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/games/games_quickref.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/games/games_quickref.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/games/games_quickref.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/credits.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/credits.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/credits.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/guides.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/guides.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/guides.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/guides.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/importprojects.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/importprojects.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/importprojects.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/importprojects.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/installingexamples.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/installingexamples.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/installingexamples.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/installingexamples.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/support.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/support.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/support.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/support.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/welcome.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/welcome.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/welcome.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/welcome.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_appmgmtsoftware.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_appmgmtsoftware.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_appmgmtsoftware.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_appmgmtsoftware.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_attributes.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_attributes.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_attributes.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_attributes.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_cldc.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_cldc.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_cldc.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_cldc.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_configuration.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_configuration.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_configuration.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_configuration.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_deviceconfiguration.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_deviceconfiguration.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_deviceconfiguration.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_deviceconfiguration.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_devicefragmentation.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_devicefragmentation.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_devicefragmentation.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_devicefragmentation.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_gamebuilder.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_gamebuilder.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_gamebuilder.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_gamebuilder.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jad.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jad.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jad.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jad.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jsr172.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jsr172.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jsr172.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jsr172.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jwti.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jwti.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jwti.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jwti.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_manifest.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_manifest.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_manifest.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_manifest.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midlet.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midlet.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midlet.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midlet.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midletsuite.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midletsuite.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midletsuite.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midletsuite.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midp.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midp.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midp.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midp.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_platform.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_platform.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_platform.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_platform.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_profile.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_profile.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_profile.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_profile.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_project.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_project.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_project.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_project.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_scenes.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_scenes.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_scenes.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_scenes.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_sprites.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_sprites.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_sprites.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_sprites.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_svg.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_svg.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_svg.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_svg.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_tiledlayers.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_tiledlayers.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_tiledlayers.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_tiledlayers.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_uei.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_uei.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_uei.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_uei.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/jmunit/jmunit_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/jmunit/jmunit_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/jmunit/jmunit_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/jmunit/jmunit_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/jmunit/jmunit_working.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/jmunit/jmunit_working.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/jmunit/jmunit_working.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/jmunit/jmunit_working.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/l10n/l10n_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/l10n/l10n_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/l10n/l10n_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/l10n/l10n_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/l10n/l10n_addsupport.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/l10n/l10n_addsupport.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/l10n/l10n_addsupport.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/l10n/l10n_addsupport.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_addproj.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_addproj.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_addproj.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_addproj.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_working.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_working.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_working.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_working.html @@ -2,7 +2,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_addcustomcomponent.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_addcustomcomponent.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_addcustomcomponent.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_addcustomcomponent.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_quickref.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_quickref.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_quickref.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_quickref.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_working.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_working.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_working.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_working.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_creating.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_creating.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_creating.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_creating.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_quickref.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_quickref.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_quickref.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_quickref.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_templates.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_templates.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_templates.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_templates.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_working.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_working.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_working.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_working.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/api_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/api_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/api_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/api_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/jad_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/jad_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/jad_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/jad_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/jarmanifest_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/jarmanifest_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/jarmanifest_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/jarmanifest_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/obfuscation_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/obfuscation_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/obfuscation_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/obfuscation_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_addAPI.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_addAPI.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_addAPI.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_addAPI.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_addlibrary.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_addlibrary.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_addlibrary.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_addlibrary.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_customize_build.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_customize_build.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_customize_build.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_customize_build.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_customizesecurity.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_customizesecurity.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_customizesecurity.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_customizesecurity.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setMIDlet.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setMIDlet.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setMIDlet.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setMIDlet.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_set_jad.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_set_jad.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_set_jad.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_set_jad.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setfiltering.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setfiltering.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setfiltering.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setfiltering.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setjar.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setjar.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setjar.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setjar.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setjavadoc.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setjavadoc.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setjavadoc.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setjavadoc.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setobfuscation.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setobfuscation.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setobfuscation.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setobfuscation.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setplatform.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setplatform.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setplatform.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setplatform.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setpushregistry.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setpushregistry.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setpushregistry.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setpushregistry.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setrun.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setrun.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setrun.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setrun.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_viewgeneral.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_viewgeneral.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_viewgeneral.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_viewgeneral.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/pushregistry_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/pushregistry_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/pushregistry_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/pushregistry_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_inota.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_inota.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_inota.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_inota.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_runapps.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_runapps.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_runapps.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_runapps.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_runheadlessapps.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_runheadlessapps.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_runheadlessapps.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_runheadlessapps.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_createkeypair.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_createkeypair.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_createkeypair.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_createkeypair.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_createkeystore.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_createkeystore.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_createkeystore.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_createkeystore.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_exportkey.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_exportkey.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_exportkey.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_exportkey.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_setdomain.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_setdomain.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_setdomain.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_setdomain.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_animations.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_animations.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_animations.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_animations.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_menus.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_menus.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_menus.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_menus.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_quickref.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_quickref.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_quickref.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_quickref.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_splashscreen.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_splashscreen.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_splashscreen.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_splashscreen.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_waitscreen.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_waitscreen.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_waitscreen.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_waitscreen.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_working.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_working.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_working.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_working.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/toolkit/about_toolkit.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/toolkit/about_toolkit.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/toolkit/about_toolkit.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/toolkit/about_toolkit.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/toolkit/toolkit_using.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/toolkit/toolkit_using.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/toolkit/toolkit_using.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/toolkit/toolkit_using.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addability.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addability.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addability.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addability.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addapi.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addapi.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addapi.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addapi.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addattribute.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addattribute.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addattribute.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addattribute.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addconfiguration.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addconfiguration.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addconfiguration.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addconfiguration.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addkeystore.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addkeystore.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addkeystore.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addkeystore.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addlibrary.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addlibrary.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addlibrary.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addlibrary.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addmidlet.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addmidlet.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addmidlet.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addmidlet.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addpushregistry.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addpushregistry.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addpushregistry.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addpushregistry.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_configtemplate.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_configtemplate.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_configtemplate.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_configtemplate.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_createkeypair.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_createkeypair.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_createkeypair.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_createkeypair.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_enterpassword.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_enterpassword.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_enterpassword.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_enterpassword.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_exportkey.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_exportkey.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_exportkey.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_exportkey.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_miscoptions_svg.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_miscoptions_svg.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_miscoptions_svg.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_miscoptions_svg.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_newability.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_newability.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_newability.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_newability.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_platformmanager.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_platformmanager.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_platformmanager.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_platformmanager.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_projectconfigs.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_projectconfigs.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_projectconfigs.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_projectconfigs.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_projectconfigurationmanager.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_projectconfigurationmanager.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_projectconfigurationmanager.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_projectconfigurationmanager.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_quickprojectrun.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_quickprojectrun.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_quickprojectrun.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_quickprojectrun.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_securitymanager.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_securitymanager.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_securitymanager.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_securitymanager.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_upgradeinformation.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_upgradeinformation.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_upgradeinformation.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_upgradeinformation.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_actioneditor.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_actioneditor.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_actioneditor.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_actioneditor.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_componentpallette.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_componentpallette.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_componentpallette.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_componentpallette.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_componentpallettemanager.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_componentpallettemanager.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_componentpallettemanager.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_componentpallettemanager.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_debugview.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_debugview.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_debugview.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_debugview.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_flowdesigner.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_flowdesigner.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_flowdesigner.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_flowdesigner.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_inspector.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_inspector.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_inspector.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_inspector.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_properties.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_properties.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_properties.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_properties.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_screendesigner.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_screendesigner.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_screendesigner.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_screendesigner.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_stringeditor.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_stringeditor.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_stringeditor.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_stringeditor.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/node_project.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/node_project.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/node_project.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/node_project.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_abilities.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_abilities.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_abilities.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_abilities.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_apipermissions.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_apipermissions.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_apipermissions.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_apipermissions.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_appdescriptor.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_appdescriptor.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_appdescriptor.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_appdescriptor.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_build.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_build.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_build.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_build.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_compiling.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_compiling.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_compiling.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_compiling.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_createjar.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_createjar.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_createjar.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_createjar.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_deploy.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_deploy.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_deploy.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_deploy.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_filtering.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_filtering.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_filtering.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_filtering.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_general.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_general.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_general.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_general.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_jad.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_jad.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_jad.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_jad.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_javadoc.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_javadoc.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_javadoc.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_javadoc.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_libraries.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_libraries.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_libraries.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_libraries.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_midlets.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_midlets.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_midlets.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_midlets.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_obfuscating.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_obfuscating.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_obfuscating.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_obfuscating.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_platform.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_platform.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_platform.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_platform.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_pushregistry.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_pushregistry.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_pushregistry.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_pushregistry.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_running.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_running.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_running.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_running.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_signing.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_signing.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_signing.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_signing.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addcomponent_selectclasses.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addcomponent_selectclasses.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addcomponent_selectclasses.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addcomponent_selectclasses.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addcomponent_selectproject.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addcomponent_selectproject.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addcomponent_selectproject.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addcomponent_selectproject.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_bootstrap.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_bootstrap.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_bootstrap.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_bootstrap.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_choosefolder.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_choosefolder.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_choosefolder.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_choosefolder.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_gi.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_gi.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_gi.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_gi.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_platforms.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_platforms.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_platforms.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_platforms.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_sources.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_sources.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_sources.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_sources.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_importexisting_specifysource.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_importexisting_specifysource.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_importexisting_specifysource.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_importexisting_specifysource.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_importwtk_specifysource.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_importwtk_specifysource.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_importwtk_specifysource.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_importwtk_specifysource.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newcdcproject_platformselection.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newcdcproject_platformselection.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newcdcproject_platformselection.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newcdcproject_platformselection.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newcustom_component.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newcustom_component.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newcustom_component.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newcustom_component.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newfile_name.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newfile_name.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newfile_name.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newfile_name.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newlocalization_name.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newlocalization_name.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newlocalization_name.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newlocalization_name.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newproject_moreconfigurations.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newproject_moreconfigurations.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newproject_moreconfigurations.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newproject_moreconfigurations.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newproject_name.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newproject_name.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newproject_name.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newproject_name.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_vdfname.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_vdfname.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_vdfname.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_vdfname.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_clientinformation.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_clientinformation.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_clientinformation.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_clientinformation.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_clientoptions.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_clientoptions.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_clientoptions.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_clientoptions.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_serviceselection.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_serviceselection.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_serviceselection.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_serviceselection.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_webappselection.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_webappselection.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_webappselection.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_webappselection.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcwexportedservices.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcwexportedservices.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcwexportedservices.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcwexportedservices.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_creating.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_creating.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_creating.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_creating.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_jsr172.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_jsr172.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_jsr172.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_jsr172.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_updatingjsr172.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_updatingjsr172.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_updatingjsr172.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_updatingjsr172.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_wsdl.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_wsdl.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_wsdl.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_wsdl.html @@ -1,7 +1,7 @@ diff --git a/nbi/engine/src/org/netbeans/installer/Installer.java b/nbi/engine/src/org/netbeans/installer/Installer.java --- a/nbi/engine/src/org/netbeans/installer/Installer.java +++ b/nbi/engine/src/org/netbeans/installer/Installer.java @@ -112,6 +112,7 @@ initializeErrorHandler(); dumpSystemInfo(); + EngineUtils.checkEngine(); initializePlatform(); instance = this; diff --git a/nbi/engine/src/org/netbeans/installer/product/components/ProductConfigurationLogic.java b/nbi/engine/src/org/netbeans/installer/product/components/ProductConfigurationLogic.java --- a/nbi/engine/src/org/netbeans/installer/product/components/ProductConfigurationLogic.java +++ b/nbi/engine/src/org/netbeans/installer/product/components/ProductConfigurationLogic.java @@ -40,6 +40,7 @@ import java.io.InputStream; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import org.netbeans.installer.utils.FileUtils; import org.netbeans.installer.utils.ResourceUtils; @@ -254,6 +255,13 @@ protected final String getString(String key) { return ResourceUtils.getString(getClass(), key); } + + protected final Map getStrings(String key) { + return ResourceUtils.getStrings(getClass(), key); + } + protected final Map getStrings(String key, Object... arguments) { + return ResourceUtils.getStrings(getClass(), key, arguments); + } protected final String getString(String key, Object... arguments) { return ResourceUtils.getString(getClass(), key, arguments); diff --git a/nbi/engine/src/org/netbeans/installer/utils/EngineUtils.java b/nbi/engine/src/org/netbeans/installer/utils/EngineUtils.java --- a/nbi/engine/src/org/netbeans/installer/utils/EngineUtils.java +++ b/nbi/engine/src/org/netbeans/installer/utils/EngineUtils.java @@ -38,7 +38,9 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.net.URL; +import java.net.URLClassLoader; import java.net.URLDecoder; import java.util.jar.Attributes; import java.util.jar.JarEntry; @@ -130,6 +132,57 @@ LogManager.logUnindent("... finished caching engine data"); } + + + public static void checkEngine() { + Class mainClass = getEngineMainClass(); + String thisClassResource = ResourceUtils.getResourceClassName(mainClass); + InputStream is = mainClass.getClassLoader().getResourceAsStream(thisClassResource); + ClassLoader cl = mainClass.getClassLoader(); + boolean exclamationMarkInURL = false; + if (cl instanceof URLClassLoader) { + URLClassLoader ucl = (URLClassLoader) cl; + for (URL url : ucl.getURLs()) { + exclamationMarkInURL = exclamationMarkInURL || url.getPath().contains("!"); + } + } + if (is == null) { + if (exclamationMarkInURL) { + String message; + if (System.getProperty("user.home").contains("!")) { + //Issue #156011 + //Note: don`t use ResourceUtils for getting string here. + message = + "Looks like the name of current user profile directory contains an exclamation mark (!):\n" + + SystemUtils.getUserHomeDirectory() + "\n\n" + + "It is not recommended to use such profile names due to JDK bugs:\n" + + "http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4730642" + "\n" + + "http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4523159" + "\n" + "\n" + + "That bugs affects the installer work as well.\n" + + "The workaround is to run installer with different temporary and working installer directory.\n" + + "For example, try run installer with the following arguments:\n" + + "--tempdir " + new File(System.getenv("SystemDrive"), "Temp") + " " + + "--userdir " + new File(System.getenv("SystemDrive"), "NBI") + "\n"; + + } else { + // some generic message + message = + "Cannot load the main class " + mainClass.getName() + " from the jar file due to JDK bugs:\n" + + "http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4730642" + "\n" + + "http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4523159" + "\n" + "\n" + + "Use other directory for the jar file.\n"; + } + + ErrorManager.notifyCritical(message); + } + } else { + try { + is.close(); + } catch (IOException e) { + } + } + } + private static File getEngineLocation() { final String propName = EngineResources.LOCAL_ENGINE_PATH_PROPERTY; @@ -206,5 +259,5 @@ } public static final String DEFAULT_ENGINE_JAR_NAME = "nbi-engine.jar";//NOI18N - + } diff --git a/nbi/engine/src/org/netbeans/installer/utils/ErrorManager.java b/nbi/engine/src/org/netbeans/installer/utils/ErrorManager.java --- a/nbi/engine/src/org/netbeans/installer/utils/ErrorManager.java +++ b/nbi/engine/src/org/netbeans/installer/utils/ErrorManager.java @@ -123,39 +123,37 @@ ERROR_LOGFILE_INFO_KEY, LogManager.getLogFile().getAbsolutePath()); } + String titleKey = null; + UiUtils.MessageType type; + switch (level) { case ErrorLevel.MESSAGE: - UiUtils.showMessageDialog( - dialogText, - ResourceUtils.getString( - ErrorManager.class, ERROR_MESSAGE_KEY), - UiUtils.MessageType.INFORMATION); - return; + titleKey = ERROR_MESSAGE_KEY; + type = UiUtils.MessageType.INFORMATION; + break; case ErrorLevel.WARNING: - UiUtils.showMessageDialog( - dialogText, - ResourceUtils.getString( - ErrorManager.class, ERROR_WARNING_KEY), - UiUtils.MessageType.WARNING); - return; + titleKey = ERROR_WARNING_KEY; + type = UiUtils.MessageType.WARNING; + break; case ErrorLevel.ERROR: - UiUtils.showMessageDialog( - dialogText, - ResourceUtils.getString( - ErrorManager.class, ERROR_ERROR_KEY), - UiUtils.MessageType.ERROR); - return; + titleKey = ERROR_ERROR_KEY; + type = UiUtils.MessageType.ERROR; + break; case ErrorLevel.CRITICAL: - UiUtils.showMessageDialog( - dialogText, - ResourceUtils.getString( - ErrorManager.class, ERROR_CRITICAL_KEY), - UiUtils.MessageType.CRITICAL); - finishHandler.criticalExit(); - return; + titleKey = ERROR_CRITICAL_KEY; + type = UiUtils.MessageType.CRITICAL; + break; default: return; } + String title = ResourceUtils.getString(ErrorManager.class, titleKey); + if(title == null) { + titleKey = type.toString(); + } + UiUtils.showMessageDialog(dialogText, titleKey, type); + if(type.equals(UiUtils.MessageType.CRITICAL)) { + finishHandler.criticalExit(); + } } public static UncaughtExceptionHandler getExceptionHandler() { diff --git a/nbi/engine/src/org/netbeans/installer/utils/ResourceUtils.java b/nbi/engine/src/org/netbeans/installer/utils/ResourceUtils.java --- a/nbi/engine/src/org/netbeans/installer/utils/ResourceUtils.java +++ b/nbi/engine/src/org/netbeans/installer/utils/ResourceUtils.java @@ -38,8 +38,12 @@ import java.io.IOException; import java.io.InputStream; +import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; +import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.MissingResourceException; import java.util.ResourceBundle; @@ -91,6 +95,37 @@ return format(getString(clazz, key), arguments); } + public static Map getStrings( + final String baseName, + final String key, + final ClassLoader loader, + final Object... arguments) { + Map map = getBundleMessagesMapForKey(baseName, key, loader); + if(arguments.length == 0) { + return map; + } else { + Map result = new HashMap(); + for(Locale locale : map.keySet()) { + result.put(locale, format(map.get(locale), arguments)); + } + return result; + } + } + + public static Map getStrings( + final String baseName, + final String key, + final Object... arguments) { + return getStrings(baseName, key, ResourceUtils.class.getClassLoader(), arguments); + } + + public static Map getStrings( + final Class clazz, + final String key, + final Object... arguments) { + return getStrings(getBundleResource(clazz), key, clazz.getClassLoader(), arguments); + } + private static String format( final String message, final Object... arguments) { @@ -156,7 +191,8 @@ final String baseName, final Locale locale, final ClassLoader loader) { - final String bundleId = loader.toString() + baseName; + final String bundleId = loader.toString() + baseName + + (locale.toString().equals(StringUtils.EMPTY_STRING) ? StringUtils.EMPTY_STRING : ("_" + locale)); ResourceBundle bundle = (ResourceBundle) loadedBundles.get(bundleId); @@ -200,6 +236,23 @@ } return message; } + + private static Map getBundleMessagesMapForKey( + final String baseName, + final String key, + final ClassLoader loader) { + Map map = new HashMap (); + List list = new ArrayList (); + list.add(new Locale(StringUtils.EMPTY_STRING)); + list.addAll(Arrays.asList(Locale.getAvailableLocales())); + for(Locale locale : list) { + ResourceBundle bundle = loadBundle(baseName, locale, loader); + if(bundle!=null && locale.equals(bundle.getLocale()) && !map.containsKey(bundle.getLocale())) { + map.put(locale, getBundleMessage(baseName, locale, loader, key)); + } + } + return map; + } private static String getBundleResource(final Class clazz) { return clazz.getPackage().getName() + BUNDLE_FILE_SUFFIX; diff --git a/nbi/engine/src/org/netbeans/installer/utils/system/MacOsNativeUtils.java b/nbi/engine/src/org/netbeans/installer/utils/system/MacOsNativeUtils.java --- a/nbi/engine/src/org/netbeans/installer/utils/system/MacOsNativeUtils.java +++ b/nbi/engine/src/org/netbeans/installer/utils/system/MacOsNativeUtils.java @@ -118,18 +118,30 @@ } @Override public File getShortcutLocation(Shortcut shortcut, LocationType locationType) throws NativeException { + if(shortcut.getPath()!=null) { + return new File(shortcut.getPath()); + } + String fileName = getShortcutFilename(shortcut); - + File file = null; switch (locationType) { case CURRENT_USER_DESKTOP: - return new File(SystemUtils.getUserHomeDirectory(), "Desktop/" + fileName); + file = new File(SystemUtils.getUserHomeDirectory(), "Desktop/" + fileName); + break; case ALL_USERS_DESKTOP: - return new File(SystemUtils.getUserHomeDirectory(), "Desktop/" + fileName); + file = new File(SystemUtils.getUserHomeDirectory(), "Desktop/" + fileName); + break; case CURRENT_USER_START_MENU: - return getDockPropertiesFile(); + file = getDockPropertiesFile(); + break; case ALL_USERS_START_MENU: - return getDockPropertiesFile(); + file = getDockPropertiesFile(); + break; + case CUSTOM: + file = new File(shortcut.getRelativePath(), fileName); + break; } + shortcut.setPath(file.getAbsolutePath()); return null; } @@ -147,29 +159,37 @@ } @Override public File createShortcut(Shortcut shortcut, LocationType locationType) throws NativeException { - final File shortcutFile = getShortcutLocation(shortcut, locationType); - try { - - if (locationType == LocationType.CURRENT_USER_DESKTOP || - locationType == LocationType.ALL_USERS_DESKTOP ) { - // create a symlink on desktop for files/directories and .url for internet shortcuts - if(!shortcutFile.exists()) { - if(shortcut instanceof FileShortcut) { - createSymLink(shortcutFile, ((FileShortcut) shortcut).getTarget()); - } else if(shortcut instanceof InternetShortcut) { - createURLShortcut((InternetShortcut)shortcut); + final File shortcutFile = getShortcutLocation(shortcut, locationType); + switch (locationType) { + case CURRENT_USER_DESKTOP: + case ALL_USERS_DESKTOP: + case CUSTOM: + // create a symlink for files/directories and .url for internet shortcuts + if (!shortcutFile.exists()) { + if (shortcut instanceof FileShortcut) { + createSymLink(shortcutFile, ((FileShortcut) shortcut).getTarget()); + } else if (shortcut instanceof InternetShortcut) { + createURLShortcut((InternetShortcut) shortcut); + } } - - } - } else if(shortcut instanceof FileShortcut && - convertDockProperties(true)==0) { //create link in the Dock - if (modifyDockLink((FileShortcut)shortcut, shortcutFile, true)) { - LogManager.log(ErrorLevel.DEBUG, - " Updating Dock"); - convertDockProperties(false); - SystemUtils.executeCommand(null,UPDATE_DOCK_COMMAND); - } + break; + case CURRENT_USER_START_MENU: + case ALL_USERS_START_MENU: + if (shortcut instanceof FileShortcut && + convertDockProperties(true) == 0) { + //create link in the Dock + if (modifyDockLink((FileShortcut) shortcut, shortcutFile, true)) { + LogManager.log(ErrorLevel.DEBUG, + " Updating Dock"); + convertDockProperties(false); + SystemUtils.executeCommand(null, UPDATE_DOCK_COMMAND); + } + } + break; + default: + LogManager.log("... unknown shortcut type " + locationType); + return null; } return shortcutFile; } catch (IOException e) { @@ -178,24 +198,32 @@ } @Override public void removeShortcut(Shortcut shortcut, LocationType locationType, boolean cleanupParents) throws NativeException { - final File shortcutFile = getShortcutLocation(shortcut, locationType); - try { - if (locationType == LocationType.CURRENT_USER_DESKTOP || - locationType == LocationType.ALL_USERS_DESKTOP ) { - // create a symlink on desktop - if(shortcutFile.exists()) { - FileUtils.deleteFile(shortcutFile,false); - } - } else if(shortcut instanceof FileShortcut && - convertDockProperties(true)==0) {//create link in the Dock - if(modifyDockLink((FileShortcut) shortcut,shortcutFile,false)) { - LogManager.log(ErrorLevel.DEBUG, - " Updating Dock"); - if(convertDockProperties(false)==0) { - SystemUtils.executeCommand(null,UPDATE_DOCK_COMMAND); + final File shortcutFile = getShortcutLocation(shortcut, locationType); + switch(locationType) { + case CURRENT_USER_DESKTOP: + case ALL_USERS_DESKTOP: + case CUSTOM: + // remove symlink from desktop + if(shortcutFile.exists()) { + FileUtils.deleteFile(shortcutFile,false); } - } + break; + case CURRENT_USER_START_MENU : + case ALL_USERS_START_MENU : + if (shortcut instanceof FileShortcut && + convertDockProperties(true) == 0) { + //remove link from the Dock + if (modifyDockLink((FileShortcut) shortcut, shortcutFile, false)) { + LogManager.log(ErrorLevel.DEBUG, "... updating Dock"); + if (convertDockProperties(false) == 0) { + SystemUtils.executeCommand(null, UPDATE_DOCK_COMMAND); + } + } + } + break; + default: + LogManager.log("... unknown shortcut type " + locationType); } } catch (IOException e) { throw new NativeException("Cannot remove shortcut", e); @@ -222,10 +250,13 @@ public boolean isTiger() { return (getOSVersion().startsWith("10.4")); } - + public boolean isLeopard() { return (getOSVersion().startsWith("10.5")); } + public boolean isSnowLeopard() { + return (getOSVersion().startsWith("10.6")); + } // private ////////////////////////////////////////////////////////////////////// private String getOSVersion() { @@ -488,7 +519,7 @@ int returnResult = 0; try { if(!isCheetah() && !isPuma()) { - if((!decode && (isTiger() || isLeopard())) || decode) { + if((!decode && (isTiger() || isLeopard() || isSnowLeopard())) || decode) { // decode for all except Cheetah and Puma // code only for Tiger and Leopard diff --git a/nbi/engine/src/org/netbeans/installer/utils/system/UnixNativeUtils.java b/nbi/engine/src/org/netbeans/installer/utils/system/UnixNativeUtils.java --- a/nbi/engine/src/org/netbeans/installer/utils/system/UnixNativeUtils.java +++ b/nbi/engine/src/org/netbeans/installer/utils/system/UnixNativeUtils.java @@ -46,6 +46,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; @@ -268,6 +269,9 @@ LogManager.logIndent( "devising the shortcut location by type: " + locationType); // NOI18N + if(shortcut.getPath()!=null) { + return new File(shortcut.getPath()); + } final File shortcutFile; switch (locationType) { @@ -293,11 +297,20 @@ shortcutFile = new File(allUsersAppFolder, getShortcutFileName(shortcut)); break; + case CUSTOM: + final String folder = shortcut.getRelativePath(); + + LogManager.log("... custom folder : " + folder); + shortcutFile = new File(folder, + getShortcutFileName(shortcut)); + break; default: shortcutFile = null; } - + if(shortcutFile!=null) { + shortcut.setPath(shortcutFile.getAbsolutePath()); + } LogManager.logUnindent( "shortcut file: " + shortcutFile); // NOI18N @@ -480,13 +493,29 @@ } return new File(userHome, "Desktop"); } + + private void addLocalizedMapEntry(List list, String entryName, Map entryMap) { + if (!entryMap.isEmpty()) { + String name = entryMap.get(new Locale(StringUtils.EMPTY_STRING)); + if(name==null) { + name = entryMap.get(Locale.getDefault()); + } + list.add(entryName + "=" + name); + for (Locale locale : entryMap.keySet()) { + if (!name.equals(entryMap.get(locale))) { + list.add(entryName + "[" + locale + "]=" + StringUtils.getLocalizedString(entryMap, locale)); + } + } + } + } private List getDesktopEntry(FileShortcut shortcut) { final List list = new ArrayList (); list.add("[Desktop Entry]"); list.add("Encoding=UTF-8"); - list.add("Name=" + shortcut.getName()); + addLocalizedMapEntry(list, "Name", shortcut.getNames()); + addLocalizedMapEntry(list, "Comment", shortcut.getDescriptions()); list.add("Exec=/bin/sh \"" + shortcut.getTarget() + "\"" + ((shortcut.getArguments()!=null && shortcut.getArguments().size()!=0) ? StringUtils.SPACE + shortcut.getArgumentsString() : StringUtils.EMPTY_STRING) @@ -512,7 +541,9 @@ final List list = new ArrayList (); list.add("[Desktop Entry]"); list.add("Encoding=UTF-8"); - list.add("Name=" + shortcut.getName()); + addLocalizedMapEntry(list, "Name", shortcut.getNames()); + addLocalizedMapEntry(list, "Comment", shortcut.getDescriptions()); + list.add("URL=" + shortcut.getURL()); if(shortcut.getIcon()!=null) { list.add("Icon=" + shortcut.getIconPath()); diff --git a/nbi/engine/src/org/netbeans/installer/utils/system/WindowsNativeUtils.java b/nbi/engine/src/org/netbeans/installer/utils/system/WindowsNativeUtils.java --- a/nbi/engine/src/org/netbeans/installer/utils/system/WindowsNativeUtils.java +++ b/nbi/engine/src/org/netbeans/installer/utils/system/WindowsNativeUtils.java @@ -364,12 +364,16 @@ return true; } - public File getShortcutLocation(Shortcut shortcut, LocationType locationType) throws NativeException { + public File getShortcutLocation(Shortcut shortcut, LocationType locationType) throws NativeException { + if (shortcut.getPath() != null) { + return new File(shortcut.getPath()); + } + String path = shortcut.getRelativePath(); if (path == null) { - path = ""; + path = ""; } - + String fileName = shortcut.getName(); if(shortcut instanceof FileShortcut) { fileName += ".lnk"; @@ -378,7 +382,7 @@ } final String allUsersRootPath = SystemUtils.getEnvironmentVariable("allusersprofile"); - + File shortcutFile = null; switch (locationType) { case CURRENT_USER_DESKTOP: String userDesktop = registry.getStringValue(HKCU, SHELL_FOLDERS_KEY, "Desktop", false); @@ -386,7 +390,8 @@ userDesktop = SystemUtils.getUserHomeDirectory() + File.separator + "Desktop"; } - return new File(userDesktop, fileName); + shortcutFile = new File(userDesktop, fileName); + break; case ALL_USERS_DESKTOP: String commonDesktop = registry.getStringValue(HKLM, SHELL_FOLDERS_KEY, "Common Desktop", false); @@ -394,7 +399,8 @@ commonDesktop = allUsersRootPath + File.separator + "Desktop"; } - return new File(commonDesktop, fileName); + shortcutFile = new File(commonDesktop, fileName); + break; case CURRENT_USER_START_MENU: String userStartMenu = registry.getStringValue(HKCU, SHELL_FOLDERS_KEY, "Programs", false); @@ -402,7 +408,8 @@ userStartMenu = SystemUtils.getUserHomeDirectory() + File.separator + "Start Menu" + File.separator + "Programs"; } - return new File(userStartMenu, path + File.separator + fileName); + shortcutFile = new File(userStartMenu, path + File.separator + fileName); + break; case ALL_USERS_START_MENU: String commonStartMenu = registry.getStringValue(HKLM, SHELL_FOLDERS_KEY, "Common Programs", false); @@ -410,10 +417,16 @@ commonStartMenu = SystemUtils.getUserHomeDirectory() + File.separator + "Start Menu" + File.separator + "Programs"; } - return new File(commonStartMenu, path + File.separator + fileName); + shortcutFile = new File(commonStartMenu, path + File.separator + fileName); + break; + case CUSTOM: + shortcutFile = new File(path + File.separator + fileName); + break; } - - return null; + if(shortcutFile!=null) { + shortcut.setPath(shortcutFile.getAbsolutePath()); + } + return shortcutFile; } protected void createURLShortcut(InternetShortcut shortcut) throws NativeException { @@ -434,8 +447,6 @@ public File createShortcut(Shortcut shortcut, LocationType locationType) throws NativeException { File shortcutFile = getShortcutLocation(shortcut, locationType); - - shortcut.setPath(shortcutFile.getAbsolutePath()); if(shortcut instanceof FileShortcut) { createShortcut0((FileShortcut)shortcut); } else if(shortcut instanceof InternetShortcut) { @@ -455,6 +466,7 @@ switch (locationType) { case CURRENT_USER_START_MENU: case ALL_USERS_START_MENU: + case CUSTOM: FileUtils.deleteEmptyParents(shortcutFile); break; default: diff --git a/nbi/engine/src/org/netbeans/installer/utils/system/shortcut/LocationType.java b/nbi/engine/src/org/netbeans/installer/utils/system/shortcut/LocationType.java --- a/nbi/engine/src/org/netbeans/installer/utils/system/shortcut/LocationType.java +++ b/nbi/engine/src/org/netbeans/installer/utils/system/shortcut/LocationType.java @@ -44,5 +44,6 @@ CURRENT_USER_DESKTOP, ALL_USERS_DESKTOP, CURRENT_USER_START_MENU, - ALL_USERS_START_MENU + ALL_USERS_START_MENU, + CUSTOM } diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/credits.html b/php.help/javahelp/org/netbeans/modules/php/help/docs/credits.html --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/credits.html +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. +Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved. The contents of this file are subject to the terms of either the GNU @@ -38,8 +38,7 @@

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

Note: Sun is not responsible for the availability of third-party web sites mentioned in this document and does not endorse and is not diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-include-path.html b/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-include-path.html --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-include-path.html +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-include-path.html @@ -8,7 +8,7 @@ http://www.sun.com/ The Original Code is NetBeans. The Initial Developer of the Original -Code is Sun Microsystems, Inc. Portions Copyright 2006 Sun +Code is Sun Microsystems, Inc. Portions Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. If you wish your version of this file to be governed by only the CDDL @@ -118,18 +118,18 @@

- - -
-   +   +
-   +   +
-   +   +
diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-run-configuration.html b/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-run-configuration.html --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-run-configuration.html +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-run-configuration.html @@ -8,7 +8,7 @@ http://www.sun.com/ The Original Code is NetBeans. The Initial Developer of the Original -Code is Sun Microsystems, Inc. Portions Copyright 2006 Sun +Code is Sun Microsystems, Inc. Portions Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. If you wish your version of this file to be governed by only the CDDL @@ -142,18 +142,18 @@

- - -
-   +   +
-   +   +
-   +   +
diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-sources.html b/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-sources.html --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-sources.html +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-sources.html @@ -8,7 +8,7 @@ http://www.sun.com/ The Original Code is NetBeans. The Initial Developer of the Original -Code is Sun Microsystems, Inc. Portions Copyright 2006 Sun +Code is Sun Microsystems, Inc. Portions Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. If you wish your version of this file to be governed by only the CDDL @@ -100,18 +100,18 @@

- - -
-   +   +
-   +   +
-   +   +
diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/findUsages-CSH.html b/php.help/javahelp/org/netbeans/modules/php/help/docs/findUsages-CSH.html --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/findUsages-CSH.html +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/findUsages-CSH.html @@ -1,6 +1,6 @@ diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/help-about.html b/php.help/javahelp/org/netbeans/modules/php/help/docs/help-about.html --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/help-about.html +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/help-about.html @@ -2,7 +2,7 @@ @@ -91,7 +91,7 @@

For a more detailed description of NetBeans PHP Editor features, please see - + diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/help-map.xml b/php.help/javahelp/org/netbeans/modules/php/help/docs/help-map.xml --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/help-map.xml +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/help-map.xml @@ -10,7 +10,7 @@ http://www.sun.com/ The Original Code is NetBeans. The Initial Developer of the Original -Code is Sun Microsystems, Inc. Portions Copyright 2006 Sun +Code is Sun Microsystems, Inc. Portions Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. If you wish your version of this file to be governed by only the CDDL diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/help-toc.xml b/php.help/javahelp/org/netbeans/modules/php/help/docs/help-toc.xml --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/help-toc.xml +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/help-toc.xml @@ -10,7 +10,7 @@ http://www.sun.com/ The Original Code is NetBeans. The Initial Developer of the Original -Code is Sun Microsystems, Inc. Portions Copyright 2006 Sun +Code is Sun Microsystems, Inc. Portions Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. If you wish your version of this file to be governed by only the CDDL diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-configure_existing_sources.html b/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-configure_existing_sources.html --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-configure_existing_sources.html +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-configure_existing_sources.html @@ -8,7 +8,7 @@ http://www.sun.com/ The Original Code is NetBeans. The Initial Developer of the Original -Code is Sun Microsystems, Inc. Portions Copyright 2006 Sun +Code is Sun Microsystems, Inc. Portions Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. If you wish your version of this file to be governed by only the CDDL @@ -107,18 +107,18 @@

- - -
-   +   +
-   +   +
-   +   +
diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-configure_no_sources.html b/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-configure_no_sources.html --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-configure_no_sources.html +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-configure_no_sources.html @@ -8,7 +8,7 @@ http://www.sun.com/ The Original Code is NetBeans. The Initial Developer of the Original -Code is Sun Microsystems, Inc. Portions Copyright 2006 Sun +Code is Sun Microsystems, Inc. Portions Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. If you wish your version of this file to be governed by only the CDDL @@ -113,18 +113,18 @@

- - -
-   +   +
-   +   +
-   +   +
diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-run-configuration.html b/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-run-configuration.html --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-run-configuration.html +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-run-configuration.html @@ -8,7 +8,7 @@ http://www.sun.com/ The Original Code is NetBeans. The Initial Developer of the Original -Code is Sun Microsystems, Inc. Portions Copyright 2006 Sun +Code is Sun Microsystems, Inc. Portions Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. If you wish your version of this file to be governed by only the CDDL @@ -290,18 +290,18 @@

- - -
-   +   +
-   +   +
-   +   +
diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/phphelp.hs b/php.help/javahelp/org/netbeans/modules/php/help/docs/phphelp.hs --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/phphelp.hs +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/phphelp.hs @@ -10,7 +10,7 @@ http://www.sun.com/ The Original Code is NetBeans. The Initial Developer of the Original -Code is Sun Microsystems, Inc. Portions Copyright 2006 Sun +Code is Sun Microsystems, Inc. Portions Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. If you wish your version of this file to be governed by only the CDDL diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/credits.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/credits.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/credits.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/credits.html @@ -2,7 +2,7 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_1.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_1.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_1.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_1.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_2.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_2.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_2.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_2.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_2_remote.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_2_remote.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_2_remote.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_2_remote.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_3_integration.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_3_integration.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_3_integration.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_3_integration.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_3_manual.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_3_manual.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_3_manual.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_3_manual.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_4_location.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_4_location.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_4_location.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_4_location.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_5_performint.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_5_performint.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_5_performint.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_5_performint.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_6_reviewadd.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_6_reviewadd.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_6_reviewadd.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_6_reviewadd.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_cpu_options_adv.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_cpu_options_adv.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_cpu_options_adv.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_cpu_options_adv.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_cpu_options_basic.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_cpu_options_basic.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_cpu_options_basic.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_cpu_options_basic.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_custom.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_custom.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_custom.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_custom.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_global.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_global.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_global.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_global.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_quick.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_quick.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_quick.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_quick.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_memory_options_adv.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_memory_options_adv.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_memory_options_adv.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_memory_options_adv.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_memory_options_basic.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_memory_options_basic.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_memory_options_basic.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_memory_options_basic.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_monitor_options_adv.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_monitor_options_adv.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_monitor_options_adv.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_monitor_options_adv.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_monitor_options_basic.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_monitor_options_basic.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_monitor_options_basic.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_monitor_options_basic.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_selecttask.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_selecttask.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_selecttask.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_selecttask.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/options_profiler.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/options_profiler.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/options_profiler.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/options_profiler.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_drilldown.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_drilldown.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_drilldown.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_drilldown.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_heap.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_heap.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_heap.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_heap.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiler.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiler.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiler.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiler.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiling_results_cpu.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiling_results_cpu.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiling_results_cpu.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiling_results_cpu.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiling_results_memory.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiling_results_memory.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiling_results_memory.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiling_results_memory.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profilingpoints.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profilingpoints.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profilingpoints.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profilingpoints.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_snap_cpu.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_snap_cpu.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_snap_cpu.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_snap_cpu.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_snap_memory.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_snap_memory.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_snap_memory.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_snap_memory.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_telemetry.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_telemetry.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_telemetry.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_telemetry.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_telemetryoverview.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_telemetryoverview.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_telemetryoverview.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_telemetryoverview.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_threads.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_threads.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_threads.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_threads.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/custom_filtersets.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/custom_filtersets.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/custom_filtersets.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/custom_filtersets.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/avgobjage.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/avgobjage.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/avgobjage.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/avgobjage.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/garbagecollection.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/garbagecollection.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/garbagecollection.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/garbagecollection.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/heapdump.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/heapdump.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/heapdump.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/heapdump.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/resultssnapshot.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/resultssnapshot.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/resultssnapshot.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/resultssnapshot.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/rootmethod.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/rootmethod.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/rootmethod.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/rootmethod.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/threadssystem.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/threadssystem.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/threadssystem.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/threadssystem.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/threadsuser.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/threadsuser.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/threadsuser.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/threadsuser.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/trackedobjects.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/trackedobjects.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/trackedobjects.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/trackedobjects.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/heap_taking.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/heap_taking.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/heap_taking.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/heap_taking.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/heapwalker.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/heapwalker.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/heapwalker.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/heapwalker.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/oqlhelp.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/oqlhelp.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/oqlhelp.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/oqlhelp.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_analyze_short.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_analyze_short.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_analyze_short.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_analyze_short.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_attach.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_attach.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_attach.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_attach.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_freeform.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_freeform.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_freeform.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_freeform.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_memory_short.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_memory_short.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_memory_short.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_memory_short.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_monitor.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_monitor.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_monitor.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_monitor.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_profilepoints.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_profilepoints.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_profilepoints.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_profilepoints.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_quickref.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_quickref.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_quickref.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_quickref.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_remote.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_remote.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_remote.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_remote.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_results.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_results.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_results.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_results.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_rootmethod.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_rootmethod.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_rootmethod.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_rootmethod.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_running.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_running.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_running.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_running.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_startlocal.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_startlocal.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_startlocal.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_startlocal.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_tasks_overview.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_tasks_overview.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_tasks_overview.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_tasks_overview.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_threads.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_threads.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_threads.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_threads.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_windows.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_windows.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_windows.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_windows.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_livefiltering.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_livefiltering.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_livefiltering.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_livefiltering.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_liveresults.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_liveresults.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_liveresults.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_liveresults.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_telemetry.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_telemetry.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_telemetry.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_telemetry.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/snap_taking.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/snap_taking.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/snap_taking.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/snap_taking.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/snapshots.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/snapshots.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/snapshots.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/snapshots.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/map.xml b/profiler/javahelp/org/netbeans/modules/profiler/docs/map.xml --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/map.xml +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/map.xml @@ -2,7 +2,7 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/create_customize_codetemplates.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/create_customize_codetemplates.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/create_customize_codetemplates.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/create_customize_codetemplates.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/credits.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/credits.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/credits.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/editor_shortcuts_codetemplates.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/editor_shortcuts_codetemplates.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/editor_shortcuts_codetemplates.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/editor_shortcuts_codetemplates.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/geminstallationdialog.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/geminstallationdialog.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/geminstallationdialog.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/geminstallationdialog.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/geminstallsettingsdialog.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/geminstallsettingsdialog.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/geminstallsettingsdialog.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/geminstallsettingsdialog.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/gemmanager.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/gemmanager.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/gemmanager.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/gemmanager.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newdbconfig.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newdbconfig.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newdbconfig.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newdbconfig.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwiz-installrails.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwiz-installrails.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwiz-installrails.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwiz-installrails.html @@ -1,5 +1,5 @@ - diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwiz-nameandloc.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwiz-nameandloc.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwiz-nameandloc.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwiz-nameandloc.html @@ -1,5 +1,5 @@ - diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwsourcewiz-nameandloc.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwsourcewiz-nameandloc.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwsourcewiz-nameandloc.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwsourcewiz-nameandloc.html @@ -1,5 +1,5 @@ - diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwiz-nameandloc.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwiz-nameandloc.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwiz-nameandloc.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwiz-nameandloc.html @@ -1,5 +1,5 @@ - diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwsourcewiz-nameandloc.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwsourcewiz-nameandloc.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwsourcewiz-nameandloc.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwsourcewiz-nameandloc.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwsourcewiz-srcfiles.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwsourcewiz-srcfiles.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwsourcewiz-srcfiles.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwsourcewiz-srcfiles.html @@ -1,5 +1,5 @@ - diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/platformmanager.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/platformmanager.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/platformmanager.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/platformmanager.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/plugininstallsettingsdialog.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/plugininstallsettingsdialog.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/plugininstallsettingsdialog.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/plugininstallsettingsdialog.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railsplugininstallationdialog.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railsplugininstallationdialog.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railsplugininstallationdialog.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railsplugininstallationdialog.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railspluginmanager.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railspluginmanager.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railspluginmanager.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railspluginmanager.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railsprojprops-railsoptions.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railsprojprops-railsoptions.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railsprojprops-railsoptions.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railsprojprops-railsoptions.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/ruby_quickref.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/ruby_quickref.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/ruby_quickref.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/ruby_quickref.html @@ -1,7 +1,7 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyoptions.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyoptions.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyoptions.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyoptions.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojectnode.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojectnode.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojectnode.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojectnode.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-javaoptions.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-javaoptions.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-javaoptions.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-javaoptions.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-runoptions.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-runoptions.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-runoptions.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-runoptions.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-sourcesoptions.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-sourcesoptions.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-sourcesoptions.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-sourcesoptions.html @@ -1,6 +1,6 @@ diff --git a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/about.html b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/about.html --- a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/about.html +++ b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/about.html @@ -1,7 +1,7 @@ diff --git a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/credits.html b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/credits.html --- a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/credits.html +++ b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

The contents of this file are subject to the terms of the Common Development and Distribution License (the License). You may not use this file except in compliance with the License.

You can obtain a copy of the License at http://www.netbeans.org/cddl.html or http://www.netbeans.org/cddl.txt.

When distributing Covered Code, include this CDDL Header Notice in each file and include the License file at http://www.netbeans.org/cddl.txt. If applicable, add the following below the CDDL Header, with the fields enclosed by brackets [] replaced by your own identifying information: "Portions Copyrighted [year] [name of copyright owner]"

-

The Original Software is NetBeans. The Initial Developer of the Original Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.

+

The Original Software is NetBeans. The Initial Developer of the Original Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

Note: Sun is not responsible for the availability of third-party web sites mentioned in this document and does not endorse and is not responsible or liable for any content, advertising, products, or other materials on or available from such sites or resources. Sun will not be responsible or liable for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods, or services available on or through any such sites or resources.

diff --git a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/jdbchelp-map.jhm b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/jdbchelp-map.jhm --- a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/jdbchelp-map.jhm +++ b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/jdbchelp-map.jhm @@ -1,6 +1,6 @@ diff --git a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/jdbchelp.hs b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/jdbchelp.hs --- a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/jdbchelp.hs +++ b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/jdbchelp.hs @@ -1,6 +1,6 @@ diff --git a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/operspecsel.html b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/operspecsel.html --- a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/operspecsel.html +++ b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/operspecsel.html @@ -1,6 +1,6 @@ diff --git a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/tableobjsel.html b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/tableobjsel.html --- a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/tableobjsel.html +++ b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/tableobjsel.html @@ -1,6 +1,6 @@ diff --git a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/wsdlprops.html b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/wsdlprops.html --- a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/wsdlprops.html +++ b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/wsdlprops.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/credits.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/credits.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/credits.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/credits.html @@ -1,7 +1,7 @@ @@ -14,7 +14,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -37,8 +37,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/pending.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/pending.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/pending.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/pending.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule-toc.xml b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule-toc.xml --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule-toc.xml +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule-toc.xml @@ -1,6 +1,6 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_auth_failed_dialog.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_auth_failed_dialog.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_auth_failed_dialog.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_auth_failed_dialog.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_cert_verification.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_cert_verification.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_cert_verification.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_cert_verification.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_chkout_wizard_p1.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_chkout_wizard_p1.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_chkout_wizard_p1.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_chkout_wizard_p1.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_chkout_wizard_p2.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_chkout_wizard_p2.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_chkout_wizard_p2.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_chkout_wizard_p2.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_copyto_dialog.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_copyto_dialog.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_copyto_dialog.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_copyto_dialog.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_diff_viewer.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_diff_viewer.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_diff_viewer.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_diff_viewer.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_history_viewer.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_history_viewer.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_history_viewer.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_history_viewer.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p1.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p1.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p1.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p1.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p2.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p2.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p2.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p2.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p3.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p3.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p3.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p3.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_manage_labels.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_manage_labels.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_manage_labels.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_manage_labels.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_merge_dialog.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_merge_dialog.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_merge_dialog.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_merge_dialog.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_merge_resolver.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_merge_resolver.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_merge_resolver.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_merge_resolver.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_options.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_options.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_options.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_options.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_prop_editor.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_prop_editor.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_prop_editor.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_prop_editor.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_relocate_dialog.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_relocate_dialog.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_relocate_dialog.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_relocate_dialog.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_revert_mod_dialog.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_revert_mod_dialog.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_revert_mod_dialog.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_revert_mod_dialog.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_search_rev_dialog.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_search_rev_dialog.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_search_rev_dialog.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_search_rev_dialog.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_switch_dialog.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_switch_dialog.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_switch_dialog.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_switch_dialog.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_versioning_window.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_versioning_window.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_versioning_window.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_versioning_window.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_about.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_about.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_about.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_about.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_branches.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_branches.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_branches.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_branches.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_checkout.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_checkout.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_checkout.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_checkout.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_commit.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_commit.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_commit.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_commit.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_diff.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_diff.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_diff.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_diff.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_histories.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_histories.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_histories.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_histories.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_import.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_import.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_import.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_import.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_merge.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_merge.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_merge.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_merge.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_mergeresolve.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_mergeresolve.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_mergeresolve.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_mergeresolve.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_overview.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_overview.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_overview.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_overview.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_quickref.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_quickref.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_quickref.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_quickref.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_recover_deleted.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_recover_deleted.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_recover_deleted.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_recover_deleted.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_revert.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_revert.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_revert.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_revert.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_setup.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_setup.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_setup.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_setup.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_status.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_status.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_status.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_status.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_updating.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_updating.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_updating.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_updating.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_using.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_using.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_using.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_using.html @@ -1,7 +1,7 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_diagrams.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_diagrams.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_diagrams.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_diagrams.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_packages.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_packages.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_packages.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_packages.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_projects.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_projects.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_projects.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_projects.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/context_palette.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/context_palette.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/context_palette.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/context_palette.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/contextual_menus_uml_diagram_editor.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/contextual_menus_uml_diagram_editor.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/contextual_menus_uml_diagram_editor.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/contextual_menus_uml_diagram_editor.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/design_windows.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/design_windows.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/design_windows.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/design_windows.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_activity.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_activity.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_activity.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_activity.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_class.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_class.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_class.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_class.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_sequence.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_sequence.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_sequence.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_sequence.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_state.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_state.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_state.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_state.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_use_case.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_use_case.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_use_case.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_use_case.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_activity.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_activity.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_activity.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_activity.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_class.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_class.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_class.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_class.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_sequence.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_sequence.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_sequence.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_sequence.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_state.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_state.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_state.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_state.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_use_case.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_use_case.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_use_case.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_use_case.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_window_navigation.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_window_navigation.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_window_navigation.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_window_navigation.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_windows.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_windows.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_windows.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_windows.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/documentation_window.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/documentation_window.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/documentation_window.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/documentation_window.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/documenting_objects.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/documenting_objects.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/documenting_objects.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/documenting_objects.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/navigation_windows.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/navigation_windows.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/navigation_windows.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/navigation_windows.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/palette.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/palette.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/palette.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/palette.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/properties_window.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/properties_window.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/properties_window.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/properties_window.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/source_editor.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/source_editor.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/source_editor.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/source_editor.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/toolbars.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/toolbars.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/toolbars.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/toolbars.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/understanding_projects_diagrams.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/understanding_projects_diagrams.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/understanding_projects_diagrams.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/understanding_projects_diagrams.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/credits.html b/uml/javahelp/org/netbeans/modules/uml/docs/credits.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/credits.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/about_design_patterns.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/about_design_patterns.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/about_design_patterns.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/about_design_patterns.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/allowing_multiple_participants.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/allowing_multiple_participants.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/allowing_multiple_participants.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/allowing_multiple_participants.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/applying_patterns.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/applying_patterns.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/applying_patterns.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/applying_patterns.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/building_user_defined_patterns.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/building_user_defined_patterns.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/building_user_defined_patterns.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/building_user_defined_patterns.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_diagram_for_user_defined_pattern.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_diagram_for_user_defined_pattern.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_diagram_for_user_defined_pattern.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_diagram_for_user_defined_pattern.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_user_defined_patterns.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_user_defined_patterns.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_user_defined_patterns.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_user_defined_patterns.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_user_defined_projects.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_user_defined_projects.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_user_defined_projects.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_user_defined_projects.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/ejb_design_patterns.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/ejb_design_patterns.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/ejb_design_patterns.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/ejb_design_patterns.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_behavioral_patterns.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_behavioral_patterns.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_behavioral_patterns.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_behavioral_patterns.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_creational_patterns.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_creational_patterns.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_creational_patterns.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_creational_patterns.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_design_patterns.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_design_patterns.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_design_patterns.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_design_patterns.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_structural_patterns.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_structural_patterns.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_structural_patterns.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_structural_patterns.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/inserting_removing_projects.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/inserting_removing_projects.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/inserting_removing_projects.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/inserting_removing_projects.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/promoting_patterns_to_design_center.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/promoting_patterns_to_design_center.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/promoting_patterns_to_design_center.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/promoting_patterns_to_design_center.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/sharing_patterns.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/sharing_patterns.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/sharing_patterns.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/sharing_patterns.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/standard_pattern_projects.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/standard_pattern_projects.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/standard_pattern_projects.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/standard_pattern_projects.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/using_design_center.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/using_design_center.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/using_design_center.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/using_design_center.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_guard_conditions.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_guard_conditions.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_guard_conditions.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_guard_conditions.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_invocations.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_invocations.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_invocations.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_invocations.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_modifying_activity_group_conditions.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_modifying_activity_group_conditions.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_modifying_activity_group_conditions.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_modifying_activity_group_conditions.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_modifying_partition_attributes.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_modifying_partition_attributes.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_modifying_partition_attributes.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_modifying_partition_attributes.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_signal.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_signal.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_signal.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_signal.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_subpartitions.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_subpartitions.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_subpartitions.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_subpartitions.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_connecting_using_activity_edges.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_connecting_using_activity_edges.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_connecting_using_activity_edges.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_connecting_using_activity_edges.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_creating_partitions.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_creating_partitions.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_creating_partitions.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_creating_partitions.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_deleting_subpartitions.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_deleting_subpartitions.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_deleting_subpartitions.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_deleting_subpartitions.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_making_interruptible_activity_group.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_making_interruptible_activity_group.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_making_interruptible_activity_group.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_making_interruptible_activity_group.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_naming_subpartitions.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_naming_subpartitions.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_naming_subpartitions.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_naming_subpartitions.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_invocation_condition.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_invocation_condition.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_invocation_condition.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_invocation_condition.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_modifying_activity_group_groupkind.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_modifying_activity_group_groupkind.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_modifying_activity_group_groupkind.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_modifying_activity_group_groupkind.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_modifying_activity_group_kind.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_modifying_activity_group_kind.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_modifying_activity_group_kind.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_modifying_activity_group_kind.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_activity_groups.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_activity_groups.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_activity_groups.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_activity_groups.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_interruptible_act_groups_object_nodes.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_interruptible_act_groups_object_nodes.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_interruptible_act_groups_object_nodes.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_interruptible_act_groups_object_nodes.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_invocations_common_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_invocations_common_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_invocations_common_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_invocations_common_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_partitions.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_partitions.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_partitions.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_partitions.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/associate_db.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/associate_db.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/associate_db.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/associate_db.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/associating_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/associating_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/associating_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/associating_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_creating_attributes.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_creating_attributes.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_creating_attributes.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_creating_attributes.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_creating_operations.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_creating_operations.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_creating_operations.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_creating_operations.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_hiding_showing_attributes.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_hiding_showing_attributes.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_hiding_showing_attributes.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_hiding_showing_attributes.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_renaming_attributes.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_renaming_attributes.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_renaming_attributes.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_renaming_attributes.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_renaming_operations.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_renaming_operations.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_renaming_operations.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_renaming_operations.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_reordering_moving_attributes.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_reordering_moving_attributes.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_reordering_moving_attributes.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_reordering_moving_attributes.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_reordering_moving_operations.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_reordering_moving_operations.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_reordering_moving_operations.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_reordering_moving_operations.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_transforming_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_transforming_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_transforming_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_transforming_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_using_compartment_customize_db.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_using_compartment_customize_db.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_using_compartment_customize_db.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_using_compartment_customize_db.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_attributes.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_attributes.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_attributes.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_attributes.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_operations.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_operations.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_operations.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_operations.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_dependency.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_dependency.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_dependency.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_dependency.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_from_selected_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_from_selected_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_from_selected_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_from_selected_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams_empty.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams_empty.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams_empty.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams_empty.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams_scoped.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams_scoped.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams_scoped.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams_scoped.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/defining_stereotype_icons.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/defining_stereotype_icons.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/defining_stereotype_icons.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/defining_stereotype_icons.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/deleting_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/deleting_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/deleting_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/deleting_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/deleting_diagrams.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/deleting_diagrams.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/deleting_diagrams.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/deleting_diagrams.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_changing_size.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_changing_size.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_changing_size.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_changing_size.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_copying.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_copying.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_copying.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_copying.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_cutting.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_cutting.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_cutting.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_cutting.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_finding.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_finding.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_finding.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_finding.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_pasting.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_pasting.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_pasting.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_pasting.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_placing.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_placing.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_placing.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_placing.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_renaming.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_renaming.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_renaming.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_renaming.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_selecting_all.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_selecting_all.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_selecting_all.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_selecting_all.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_selecting_all_similar.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_selecting_all_similar.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_selecting_all_similar.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_selecting_all_similar.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_using_redefine_db.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_using_redefine_db.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_using_redefine_db.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_using_redefine_db.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/generating_code.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/generating_code.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/generating_code.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/generating_code.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_assigning_preset_values.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_assigning_preset_values.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_assigning_preset_values.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_assigning_preset_values.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_assigning_userdef_values.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_assigning_userdef_values.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_assigning_userdef_values.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_assigning_userdef_values.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_showing_hiding_values.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_showing_hiding_values.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_showing_hiding_values.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_showing_hiding_values.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_end_names.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_end_names.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_end_names.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_end_names.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_multiplicity.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_multiplicity.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_multiplicity.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_multiplicity.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_names.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_names.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_names.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_names.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/locking_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/locking_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/locking_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/locking_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/opening_closing.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/opening_closing.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/opening_closing.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/opening_closing.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_creating_interaction_occ_to_nest_diagrams.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_creating_interaction_occ_to_nest_diagrams.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_creating_interaction_occ_to_nest_diagrams.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_creating_interaction_occ_to_nest_diagrams.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_creating_populating_combined_fragments.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_creating_populating_combined_fragments.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_creating_populating_combined_fragments.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_creating_populating_combined_fragments.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_interaction_operators.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_interaction_operators.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_interaction_operators.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_interaction_operators.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_showing_hiding_indicators.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_showing_hiding_indicators.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_showing_hiding_indicators.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_showing_hiding_indicators.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_messagewidth_spacing.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_messagewidth_spacing.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_messagewidth_spacing.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_messagewidth_spacing.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_nowidth_spacing.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_nowidth_spacing.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_nowidth_spacing.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_nowidth_spacing.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_retainminwidth_spacing.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_retainminwidth_spacing.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_retainminwidth_spacing.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_retainminwidth_spacing.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_combined_fragments.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_combined_fragments.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_combined_fragments.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_combined_fragments.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_element_spacing_restrictions.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_element_spacing_restrictions.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_element_spacing_restrictions.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_element_spacing_restrictions.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_interaction_operand_boxes.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_interaction_operand_boxes.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_interaction_operand_boxes.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_interaction_operand_boxes.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/source_code_synchronization.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/source_code_synchronization.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/source_code_synchronization.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/source_code_synchronization.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_adding_simple_states.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_adding_simple_states.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_adding_simple_states.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_adding_simple_states.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_connecting_simple_states.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_connecting_simple_states.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_connecting_simple_states.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_connecting_simple_states.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_ww_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_ww_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_ww_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_ww_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_actors_use_cases.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_actors_use_cases.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_actors_use_cases.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_actors_use_cases.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_dependencies_extension_points.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_dependencies_extension_points.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_dependencies_extension_points.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_dependencies_extension_points.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_use_case_sub_details.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_use_case_sub_details.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_use_case_sub_details.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_use_case_sub_details.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/ww_diagrams_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/ww_diagrams_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/ww_diagrams_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/ww_diagrams_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/discovering_navigating_links.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/discovering_navigating_links.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/discovering_navigating_links.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/discovering_navigating_links.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/display_drawing_preferences_db.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/display_drawing_preferences_db.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/display_drawing_preferences_db.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/display_drawing_preferences_db.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/filtering_element_types_from_projects_window.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/filtering_element_types_from_projects_window.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/filtering_element_types_from_projects_window.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/filtering_element_types_from_projects_window.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_between_instances_classifiers.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_between_instances_classifiers.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_between_instances_classifiers.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_between_instances_classifiers.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_by_links_in_diagrams.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_by_links_in_diagrams.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_by_links_in_diagrams.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_by_links_in_diagrams.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_diagram_element.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_diagram_element.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_diagram_element.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_diagram_element.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_within_diagrams.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_within_diagrams.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_within_diagrams.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_within_diagrams.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/specifying_display_drawing_preferences.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/specifying_display_drawing_preferences.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/specifying_display_drawing_preferences.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/specifying_display_drawing_preferences.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/stacking_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/stacking_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/stacking_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/stacking_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/using_diagram_windows.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/using_diagram_windows.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/using_diagram_windows.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/using_diagram_windows.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/using_overview_window.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/using_overview_window.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/using_overview_window.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/using_overview_window.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/ww_editors_windows.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/ww_editors_windows.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/ww_editors_windows.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/ww_editors_windows.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/zooming_in_diagrams.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/zooming_in_diagrams.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/zooming_in_diagrams.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/zooming_in_diagrams.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_guard_condition.html b/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_guard_condition.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_guard_condition.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_guard_condition.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_pseudostate.html b/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_pseudostate.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_pseudostate.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_pseudostate.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_structured_activity_group.html b/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_structured_activity_group.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_structured_activity_group.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_structured_activity_group.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/modeling_basics.html b/uml/javahelp/org/netbeans/modules/uml/docs/modeling_basics.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/modeling_basics.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/modeling_basics.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/modeling_features.html b/uml/javahelp/org/netbeans/modules/uml/docs/modeling_features.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/modeling_features.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/modeling_features.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/modeling_introduction.html b/uml/javahelp/org/netbeans/modules/uml/docs/modeling_introduction.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/modeling_introduction.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/modeling_introduction.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/prefs/categories_in_preferences_editor.html b/uml/javahelp/org/netbeans/modules/uml/docs/prefs/categories_in_preferences_editor.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/prefs/categories_in_preferences_editor.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/prefs/categories_in_preferences_editor.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/prefs/configuring_templates_options.html b/uml/javahelp/org/netbeans/modules/uml/docs/prefs/configuring_templates_options.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/prefs/configuring_templates_options.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/prefs/configuring_templates_options.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/prefs/configuring_uml_modeling.html b/uml/javahelp/org/netbeans/modules/uml/docs/prefs/configuring_uml_modeling.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/prefs/configuring_uml_modeling.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/prefs/configuring_uml_modeling.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/prefs/using_preferences_editor.html b/uml/javahelp/org/netbeans/modules/uml/docs/prefs/using_preferences_editor.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/prefs/using_preferences_editor.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/prefs/using_preferences_editor.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/about_java_code_rev_eng.html b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/about_java_code_rev_eng.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/about_java_code_rev_eng.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/about_java_code_rev_eng.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/classes.html b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/classes.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/classes.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/classes.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/exceptions_access_control_modifiers.html b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/exceptions_access_control_modifiers.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/exceptions_access_control_modifiers.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/exceptions_access_control_modifiers.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/interfaces.html b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/interfaces.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/interfaces.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/interfaces.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/launching_rev_eng.html b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/launching_rev_eng.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/launching_rev_eng.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/launching_rev_eng.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/packages.html b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/packages.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/packages.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/packages.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/reference_classes.html b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/reference_classes.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/reference_classes.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/reference_classes.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/reverse_eng_dialog_box.html b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/reverse_eng_dialog_box.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/reverse_eng_dialog_box.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/reverse_eng_dialog_box.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/round_trip_eng/setting_java_prefs.html b/uml/javahelp/org/netbeans/modules/uml/docs/round_trip_eng/setting_java_prefs.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/round_trip_eng/setting_java_prefs.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/round_trip_eng/setting_java_prefs.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/creating.html b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/creating.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/creating.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/creating.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/deleting.html b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/deleting.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/deleting.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/deleting.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/renaming.html b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/renaming.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/renaming.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/renaming.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/workingwith.html b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/workingwith.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/workingwith.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/workingwith.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/creating_project.html b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/creating_project.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/creating_project.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/creating_project.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/deleting_project.html b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/deleting_project.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/deleting_project.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/deleting_project.html @@ -1,6 +1,6 @@ @@ -32,7 +32,7 @@

 

-Copyright © 2008 Sun Microsystems, Inc. All rights reserved.
+Copyright © 2009 Sun Microsystems, Inc. All rights reserved.
Legal Notices diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/workingwith.html b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/workingwith.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/workingwith.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/workingwith.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_workspace/locating_diagram_components.html b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_workspace/locating_diagram_components.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_workspace/locating_diagram_components.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_workspace/locating_diagram_components.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_workspace/moving_components.html b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_workspace/moving_components.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_workspace/moving_components.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_workspace/moving_components.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp-TOC.xml b/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp-TOC.xml --- a/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp-TOC.xml +++ b/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp-TOC.xml @@ -4,7 +4,7 @@ "http://java.sun.com/products/javahelp/toc_2_0.dtd"> diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp.hs b/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp.hs --- a/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp.hs +++ b/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp.hs @@ -4,7 +4,7 @@ "http://java.sun.com/products/javahelp/helpset_2_0.dtd"> diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp.jhm b/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp.jhm --- a/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp.jhm +++ b/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp.jhm @@ -4,7 +4,7 @@ "http://java.sun.com/products/javahelp/map_1_0.dtd"> diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/web_reports/generating_model_reports.html b/uml/javahelp/org/netbeans/modules/uml/docs/web_reports/generating_model_reports.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/web_reports/generating_model_reports.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/web_reports/generating_model_reports.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/web_reports/viewing_reports.html b/uml/javahelp/org/netbeans/modules/uml/docs/web_reports/viewing_reports.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/web_reports/viewing_reports.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/web_reports/viewing_reports.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/Map.jhm b/usersguide/javahelp/org/netbeans/modules/usersguide/Map.jhm --- a/usersguide/javahelp/org/netbeans/modules/usersguide/Map.jhm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/Map.jhm @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/accessibility_home.html b/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/accessibility_home.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/accessibility_home.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/accessibility_home.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/alternate_browser.html b/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/alternate_browser.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/alternate_browser.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/alternate_browser.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/stylesheet.html b/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/stylesheet.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/stylesheet.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/stylesheet.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/collab_about.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/collab_about.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/collab_about.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/collab_about.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_create_tracker.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_create_tracker.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_create_tracker.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_create_tracker.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_html_response.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_html_response.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_html_response.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_html_response.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_options.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_options.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_options.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_options.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_patchcontextchooser.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_patchcontextchooser.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_patchcontextchooser.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_patchcontextchooser.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_save_query.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_save_query.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_save_query.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_save_query.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_select_keyword.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_select_keyword.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_select_keyword.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_select_keyword.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_vcs_parameterformat.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_vcs_parameterformat.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_vcs_parameterformat.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_vcs_parameterformat.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/new_kenai_project1.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/new_kenai_project1.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/new_kenai_project1.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/new_kenai_project1.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/new_kenai_project2.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/new_kenai_project2.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/new_kenai_project2.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/new_kenai_project2.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/proj_project_window.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/proj_project_window.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/proj_project_window.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/proj_project_window.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/share_kenai_project.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/share_kenai_project.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/share_kenai_project.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/share_kenai_project.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_about.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_about.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_about.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_about.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_external.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_external.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_external.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_external.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_quickref.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_quickref.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_quickref.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_quickref.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_working.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_working.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_working.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_working.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/kenai_quickref.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/kenai_quickref.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/kenai_quickref.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/kenai_quickref.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_about.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_about.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_about.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_about.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_importing.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_importing.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_importing.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_importing.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_options.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_options.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_options.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_options.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_overview.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_overview.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_overview.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_overview.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_quickref.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_quickref.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_quickref.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_quickref.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_startup-switches.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_startup-switches.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_startup-switches.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_startup-switches.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/autoupdate.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/autoupdate.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/autoupdate.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/autoupdate.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_installed.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_installed.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_installed.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_installed.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_newplugs.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_newplugs.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_newplugs.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_newplugs.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_settings.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_settings.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_settings.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_settings.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_updates.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_updates.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_updates.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_updates.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/enablemodule.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/enablemodule.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/enablemodule.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/enablemodule.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/managing_a_module.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/managing_a_module.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/managing_a_module.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/managing_a_module.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/updatecenters.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/updatecenters.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/updatecenters.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/updatecenters.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_diffengine.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_diffengine.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_diffengine.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_diffengine.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_editor.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_editor.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_editor.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_editor.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_file_types.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_file_types.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_file_types.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_file_types.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_fontscolors.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_fontscolors.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_fontscolors.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_fontscolors.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_general.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_general.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_general.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_general.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_todo_settings.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_todo_settings.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_todo_settings.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_todo_settings.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_versioning.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_versioning.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_versioning.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_versioning.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/toolbar_commands.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/toolbar_commands.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/toolbar_commands.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/toolbar_commands.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/toolbar_customize.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/toolbar_customize.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/toolbar_customize.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/toolbar_customize.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/window_managing.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/window_managing.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/window_managing.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/window_managing.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/credits.html b/usersguide/javahelp/org/netbeans/modules/usersguide/credits.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/credits.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. +Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved. The contents of this file are subject to the terms of either the GNU @@ -38,8 +38,7 @@

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

Note: Sun is not responsible for the availability of third-party web sites mentioned in this document and does not endorse and is not diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/editing/csh/nav_window.html b/usersguide/javahelp/org/netbeans/modules/usersguide/editing/csh/nav_window.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/editing/csh/nav_window.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/editing/csh/nav_window.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/editing/editor_quickref.html b/usersguide/javahelp/org/netbeans/modules/usersguide/editing/editor_quickref.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/editing/editor_quickref.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/editing/editor_quickref.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/file_encoding.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/file_encoding.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/file_encoding.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/file_encoding.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_diff.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_diff.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_diff.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_diff.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_favorite.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_favorite.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_favorite.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_favorite.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_icons.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_icons.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_icons.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_icons.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_ignore-files.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_ignore-files.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_ignore-files.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_ignore-files.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_properties.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_properties.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_properties.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_properties.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_runtime.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_runtime.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_runtime.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_runtime.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_search.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_search.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_search.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_search.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_template.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_template.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_template.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_template.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_unknown.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_unknown.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_unknown.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_unknown.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/find_regexp.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/find_regexp.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/find_regexp.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/find_regexp.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/tasklist-csh.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/tasklist-csh.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/tasklist-csh.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/tasklist-csh.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/getstart/install_samp_apps.html b/usersguide/javahelp/org/netbeans/modules/usersguide/getstart/install_samp_apps.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/getstart/install_samp_apps.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/getstart/install_samp_apps.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/getstart/welcome.html b/usersguide/javahelp/org/netbeans/modules/usersguide/getstart/welcome.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/getstart/welcome.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/getstart/welcome.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/ide-toc.xml b/usersguide/javahelp/org/netbeans/modules/usersguide/ide-toc.xml --- a/usersguide/javahelp/org/netbeans/modules/usersguide/ide-toc.xml +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/ide-toc.xml @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/ide.css b/usersguide/javahelp/org/netbeans/modules/usersguide/ide.css --- a/usersguide/javahelp/org/netbeans/modules/usersguide/ide.css +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/ide.css @@ -1,7 +1,7 @@ /* * rave.css 08/13/2004 * - * Copyright © 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * * Changes from NetBeans ide.css: diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/ide.hs b/usersguide/javahelp/org/netbeans/modules/usersguide/ide.hs --- a/usersguide/javahelp/org/netbeans/modules/usersguide/ide.hs +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/ide.hs @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/code_completion.html b/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/code_completion.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/code_completion.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/code_completion.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/function_jumping.html b/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/function_jumping.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/function_jumping.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/function_jumping.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/js_basics.html b/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/js_basics.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/js_basics.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/js_basics.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/quickfixes.html b/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/quickfixes.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/quickfixes.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/quickfixes.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/refactoring.html b/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/refactoring.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/refactoring.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/refactoring.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/csh/hist_diff_viewer.html b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/csh/hist_diff_viewer.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/csh/hist_diff_viewer.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/csh/hist_diff_viewer.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/csh/hist_revert_dialog.html b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/csh/hist_revert_dialog.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/csh/hist_revert_dialog.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/csh/hist_revert_dialog.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_about.html b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_about.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_about.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_about.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_browsing.html b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_browsing.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_browsing.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_browsing.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_quickref.html b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_quickref.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_quickref.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_quickref.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_recovering_deleted.html b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_recovering_deleted.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_recovering_deleted.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_recovering_deleted.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_reverting.html b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_reverting.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_reverting.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_reverting.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_settings.html b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_settings.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_settings.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_settings.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/misc-general/waiting.html b/usersguide/javahelp/org/netbeans/modules/usersguide/misc-general/waiting.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/misc-general/waiting.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/misc-general/waiting.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/pending.html b/usersguide/javahelp/org/netbeans/modules/usersguide/pending.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/pending.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/pending.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/csh_library_manager.html b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/csh_library_manager.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/csh_library_manager.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/csh_library_manager.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_fav_window.html b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_fav_window.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_fav_window.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_fav_window.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_files_window.html b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_files_window.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_files_window.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_files_window.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_group.html b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_group.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_group.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_group.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_project_window.html b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_project_window.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_project_window.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_project_window.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_wiz.html b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_wiz.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_wiz.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_wiz.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/project/proj_encoding.html b/usersguide/javahelp/org/netbeans/modules/usersguide/project/proj_encoding.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/project/proj_encoding.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/project/proj_encoding.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/abbreviations-list.html b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/abbreviations-list.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/abbreviations-list.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/abbreviations-list.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/editorcuts.html b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/editorcuts.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/editorcuts.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/editorcuts.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/jhshortcuts.html b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/jhshortcuts.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/jhshortcuts.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/jhshortcuts.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/kybdshortcuts.html b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/kybdshortcuts.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/kybdshortcuts.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/kybdshortcuts.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/mac.html b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/mac.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/mac.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/mac.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/menucuts-setting.html b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/menucuts-setting.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/menucuts-setting.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/menucuts-setting.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/menucuts.html b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/menucuts.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/menucuts.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/menucuts.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/window-navcuts.html b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/window-navcuts.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/window-navcuts.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/window-navcuts.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/tbd.html b/usersguide/javahelp/org/netbeans/modules/usersguide/tbd.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/tbd.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/tbd.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/bypassproxy.html b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/bypassproxy.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/bypassproxy.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/bypassproxy.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/config_browser.html b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/config_browser.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/config_browser.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/config_browser.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/default.html b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/default.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/default.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/default.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/options.html b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/options.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/options.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/options.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/proxy.html b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/proxy.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/proxy.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/proxy.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/webbrowser.html b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/webbrowser.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/webbrowser.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/webbrowser.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/glossary_xmlcatalog.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/glossary_xmlcatalog.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/glossary_xmlcatalog.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/glossary_xmlcatalog.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_about.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_about.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_about.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_about.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_edit.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_edit.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_edit.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_edit.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_formats.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_formats.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_formats.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_formats.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_mount.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_mount.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_mount.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_mount.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_addreference.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_addreference.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_addreference.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_addreference.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_check.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_check.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_check.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_check.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_create.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_create.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_create.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_create.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_edit.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_edit.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_edit.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_edit.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_create.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_create.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_create.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_create.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_document.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_document.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_document.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_document.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_generatedom.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_generatedom.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_generatedom.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_generatedom.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/Oasis_sample.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/Oasis_sample.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/Oasis_sample.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/Oasis_sample.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/XCat_sample.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/XCat_sample.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/XCat_sample.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/XCat_sample.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/XMLCat_sample.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/XMLCat_sample.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/XMLCat_sample.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/XMLCat_sample.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/sax/sax_about.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/sax/sax_about.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/sax/sax_about.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/sax/sax_about.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/sax/sax_generate.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/sax/sax_generate.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/sax/sax_generate.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/sax/sax_generate.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/schema/schemas.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/schema/schemas.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/schema/schemas.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/schema/schemas.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_about.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_about.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_about.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_about.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_check.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_check.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_check.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_check.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_create.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_create.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_create.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_create.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_edit.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_edit.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_edit.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_edit.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_editor-props.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_editor-props.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_editor-props.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_editor-props.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_overview.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_overview.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_overview.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_overview.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_quickref.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_quickref.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_quickref.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_quickref.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_settings.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_settings.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_settings.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_settings.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_validate.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_validate.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_validate.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_validate.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xsl/xsl_about.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xsl/xsl_about.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xsl/xsl_about.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xsl/xsl_about.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xsl/xsl_transform.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xsl/xsl_transform.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xsl/xsl_transform.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xsl/xsl_transform.html @@ -1,6 +1,6 @@ diff --git a/utilities/src/org/netbeans/modules/search/ResultViewPanel.java b/utilities/src/org/netbeans/modules/search/ResultViewPanel.java --- a/utilities/src/org/netbeans/modules/search/ResultViewPanel.java +++ b/utilities/src/org/netbeans/modules/search/ResultViewPanel.java @@ -145,6 +145,7 @@ private final JPanel resultsPanel; private final JToolBar toolBar; + private JSeparator toolbarSeparator; private JButton btnShowDetails = new JButton(); private JButton btnModifySearch = new JButton(); private JButton btnStop = new JButton(); @@ -231,7 +232,7 @@ }); // Toolbar separator - JSeparator toolbarSeparator = new JSeparator(); + toolbarSeparator = new JSeparator(); toolbarSeparator.setOrientation(SwingConstants.VERTICAL); //Buttons panel @@ -286,34 +287,11 @@ JSeparator buttonsPanelSeparator = new JSeparator(); buttonsPanelSeparator.setOrientation(SwingConstants.HORIZONTAL); + add(toolBar, getToolbarConstraints()); + add(toolbarSeparator, getToolbarSeparatorConstraints()); + add(resultsPanel, getMainPanelConstraints()); - GridBagConstraints gridBagConstraints = new GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 0; - gridBagConstraints.gridheight = 3; - gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.weighty = 1.0; - add(toolBar, gridBagConstraints); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 1; - gridBagConstraints.gridy = 0; - gridBagConstraints.gridheight = 3; - gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.weighty = 1.0; - add(toolbarSeparator, gridBagConstraints); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 2; - gridBagConstraints.gridy = 0; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.weightx = 1.0; - gridBagConstraints.weighty = 1.0; - add(resultsPanel, gridBagConstraints); - - gridBagConstraints = new java.awt.GridBagConstraints(); + GridBagConstraints gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 2; gridBagConstraints.gridy = 1; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; @@ -687,8 +665,9 @@ if (issuesPanel != null){ this.issuesPanel = issuesPanel; remove(toolBar); + remove(toolbarSeparator); remove(resultsPanel); - add(issuesPanel, BorderLayout.CENTER); + add(issuesPanel, getMainPanelConstraints()); validate(); repaint(); } @@ -699,14 +678,49 @@ void removeIssuesPanel() { if (issuesPanel != null) { remove(issuesPanel); - add(toolBar, BorderLayout.WEST); - add(resultsPanel, BorderLayout.CENTER); + add(toolBar, getToolbarConstraints()); + add(toolbarSeparator, getToolbarSeparatorConstraints()); + add(resultsPanel, getMainPanelConstraints()); issuesPanel = null; validate(); repaint(); } } + private GridBagConstraints getMainPanelConstraints(){ + GridBagConstraints gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 2; + gridBagConstraints.gridy = 0; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.weighty = 1.0; + + return gridBagConstraints; + } + + private GridBagConstraints getToolbarConstraints(){ + GridBagConstraints gridBagConstraints = new GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 0; + gridBagConstraints.gridheight = 3; + gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.weighty = 1.0; + + return gridBagConstraints; + } + + private GridBagConstraints getToolbarSeparatorConstraints(){ + GridBagConstraints gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 0; + gridBagConstraints.gridheight = 3; + gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.weighty = 1.0; + + return gridBagConstraints; + } /** * Enables or disables the Display Context button, diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/credits.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/credits.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/credits.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/credits.html @@ -1,7 +1,7 @@  @@ -15,7 +15,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -38,8 +38,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule-toc.xml b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule-toc.xml --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule-toc.xml +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule-toc.xml @@ -1,6 +1,6 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_add_var_dialog.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_add_var_dialog.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_add_var_dialog.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_add_var_dialog.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_branch_dialog.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_branch_dialog.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_branch_dialog.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_branch_dialog.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_browsetags_dialog.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_browsetags_dialog.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_browsetags_dialog.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_browsetags_dialog.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_change_root.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_change_root.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_change_root.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_change_root.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkout_wizard_p1.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkout_wizard_p1.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkout_wizard_p1.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkout_wizard_p1.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkout_wizard_p2.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkout_wizard_p2.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkout_wizard_p2.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkout_wizard_p2.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkoutcomplete_dialog.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkoutcomplete_dialog.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkoutcomplete_dialog.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkoutcomplete_dialog.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkoutmodules_dialog.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkoutmodules_dialog.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkoutmodules_dialog.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkoutmodules_dialog.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_commit_dialog.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_commit_dialog.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_commit_dialog.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_commit_dialog.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_diff_viewer.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_diff_viewer.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_diff_viewer.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_diff_viewer.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_editroot_dialog.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_editroot_dialog.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_editroot_dialog.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_editroot_dialog.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_history_viewer.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_history_viewer.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_history_viewer.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_history_viewer.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_import_wizard_p1.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_import_wizard_p1.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_import_wizard_p1.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_import_wizard_p1.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_import_wizard_p2.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_import_wizard_p2.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_import_wizard_p2.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_import_wizard_p2.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_merge_resolver.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_merge_resolver.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_merge_resolver.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_merge_resolver.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_mergebranch_dialog.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_mergebranch_dialog.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_mergebranch_dialog.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_mergebranch_dialog.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_options_window.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_options_window.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_options_window.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_options_window.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_switchbranch_dialog.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_switchbranch_dialog.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_switchbranch_dialog.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_switchbranch_dialog.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_tag_dialog.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_tag_dialog.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_tag_dialog.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_tag_dialog.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_versioning_window.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_versioning_window.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_versioning_window.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_versioning_window.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_view_revision_dialog.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_view_revision_dialog.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_view_revision_dialog.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_view_revision_dialog.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_about.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_about.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_about.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_about.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_branches.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_branches.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_branches.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_branches.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_checkout.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_checkout.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_checkout.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_checkout.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_commit.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_commit.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_commit.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_commit.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_diff.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_diff.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_diff.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_diff.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_histories.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_histories.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_histories.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_histories.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_import.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_import.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_import.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_import.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_merge.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_merge.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_merge.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_merge.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_mergeresolve.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_mergeresolve.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_mergeresolve.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_mergeresolve.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_overview.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_overview.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_overview.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_overview.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_patch.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_patch.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_patch.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_patch.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_quickref.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_quickref.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_quickref.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_quickref.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_recover_deleted.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_recover_deleted.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_recover_deleted.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_recover_deleted.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_reverting.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_reverting.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_reverting.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_reverting.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_settings.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_settings.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_settings.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_settings.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_setup.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_setup.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_setup.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_setup.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_status.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_status.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_status.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_status.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_tagging.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_tagging.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_tagging.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_tagging.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_updating.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_updating.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_updating.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_updating.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_using.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_using.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_using.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_using.html @@ -1,7 +1,7 @@ diff --git a/web.examples/src/org/netbeans/modules/web/examples/FoldersListSettings.java b/web.examples/src/org/netbeans/modules/web/examples/FoldersListSettings.java --- a/web.examples/src/org/netbeans/modules/web/examples/FoldersListSettings.java +++ b/web.examples/src/org/netbeans/modules/web/examples/FoldersListSettings.java @@ -50,8 +50,6 @@ private static final String LAST_EXTERNAL_SOURCE_ROOT = "srcRoot"; //NOI18N private static final String NEW_PROJECT_COUNT = "newProjectCount"; //NOI18N -// private static final String SHOW_AGAIN_BROKEN_REF_ALERT = "showAgainBrokenRefAlert"; //NOI18N - public String displayName() { return NbBundle.getMessage (FoldersListSettings.class, "TXT_WebProjectFolderList"); //NOI18N } @@ -76,15 +74,6 @@ getPreferences().putInt(NEW_PROJECT_COUNT, count); } -// public boolean isShowAgainBrokenRefAlert() { -// Boolean b = (Boolean)getProperty(SHOW_AGAIN_BROKEN_REF_ALERT); -// return b == null ? true : b.booleanValue(); -// } -// -// public void setShowAgainBrokenRefAlert(boolean again) { -// this.putProperty(SHOW_AGAIN_BROKEN_REF_ALERT, Boolean.valueOf(again), true); -// } - public static FoldersListSettings getDefault () { return INSTANCE; } diff --git a/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProject.java b/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProject.java --- a/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProject.java +++ b/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProject.java @@ -45,11 +45,9 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; - import javax.swing.JComponent; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; - import org.openide.WizardDescriptor; import org.openide.util.HelpCtx; diff --git a/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.form b/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.form --- a/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.form +++ b/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.form @@ -1,11 +1,15 @@ - + + + + + diff --git a/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.java b/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.java --- a/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.java +++ b/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.java @@ -42,12 +42,11 @@ package org.netbeans.modules.web.examples; import javax.swing.JPanel; - import org.openide.WizardDescriptor; import org.openide.util.HelpCtx; import org.openide.util.NbBundle; -public class PanelConfigureProjectVisual extends JPanel implements HelpCtx.Provider { +class PanelConfigureProjectVisual extends JPanel implements HelpCtx.Provider { private PanelConfigureProject panel; diff --git a/web.examples/src/org/netbeans/modules/web/examples/PanelOptionsVisual.form b/web.examples/src/org/netbeans/modules/web/examples/PanelOptionsVisual.form --- a/web.examples/src/org/netbeans/modules/web/examples/PanelOptionsVisual.form +++ b/web.examples/src/org/netbeans/modules/web/examples/PanelOptionsVisual.form @@ -1,7 +1,15 @@ - + + + + + + + + + @@ -16,7 +24,6 @@ - diff --git a/web.examples/src/org/netbeans/modules/web/examples/PanelOptionsVisual.java b/web.examples/src/org/netbeans/modules/web/examples/PanelOptionsVisual.java --- a/web.examples/src/org/netbeans/modules/web/examples/PanelOptionsVisual.java +++ b/web.examples/src/org/netbeans/modules/web/examples/PanelOptionsVisual.java @@ -41,11 +41,9 @@ package org.netbeans.modules.web.examples; -import org.netbeans.modules.web.api.webmodule.WebModule; import org.openide.WizardDescriptor; -import org.openide.util.NbBundle; -public class PanelOptionsVisual extends javax.swing.JPanel { +class PanelOptionsVisual extends javax.swing.JPanel { private PanelConfigureProject panel; diff --git a/web.examples/src/org/netbeans/modules/web/examples/PanelProjectLocationVisual.form b/web.examples/src/org/netbeans/modules/web/examples/PanelProjectLocationVisual.form --- a/web.examples/src/org/netbeans/modules/web/examples/PanelProjectLocationVisual.form +++ b/web.examples/src/org/netbeans/modules/web/examples/PanelProjectLocationVisual.form @@ -1,19 +1,30 @@ - + + + + + + + + + + + + - + - + @@ -40,13 +51,13 @@ - + - + @@ -70,7 +81,7 @@ - + @@ -91,13 +102,13 @@ - + - + diff --git a/web.examples/src/org/netbeans/modules/web/examples/PanelProjectLocationVisual.java b/web.examples/src/org/netbeans/modules/web/examples/PanelProjectLocationVisual.java --- a/web.examples/src/org/netbeans/modules/web/examples/PanelProjectLocationVisual.java +++ b/web.examples/src/org/netbeans/modules/web/examples/PanelProjectLocationVisual.java @@ -43,17 +43,15 @@ import java.io.File; import java.text.MessageFormat; - import javax.swing.JFileChooser; +import javax.swing.JPanel; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; - import org.netbeans.spi.project.ui.support.ProjectChooser; - import org.openide.WizardDescriptor; import org.openide.util.NbBundle; -public class PanelProjectLocationVisual extends SettingsPanel implements DocumentListener { +class PanelProjectLocationVisual extends JPanel implements DocumentListener { private PanelConfigureProject panel; @@ -61,7 +59,6 @@ public PanelProjectLocationVisual(PanelConfigureProject panel) { initComponents(); this.panel = panel; -// projectNameTextField.setEditable(false); // Register listener on the textFields to make the automatic updates projectNameTextField.getDocument().addDocumentListener(this); @@ -73,7 +70,8 @@ * WARNING: Do NOT modify this code. The content of this method is * always regenerated by the Form Editor. */ - private void initComponents() {//GEN-BEGIN:initComponents + // //GEN-BEGIN:initComponents + private void initComponents() { java.awt.GridBagConstraints gridBagConstraints; projectNameLabel = new javax.swing.JLabel(); @@ -86,31 +84,29 @@ setLayout(new java.awt.GridBagLayout()); - projectNameLabel.setDisplayedMnemonic(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "LBL_NWP1_ProjectName_LabelMnemonic").charAt(0)); + projectNameLabel.setDisplayedMnemonic(java.util.ResourceBundle.getBundle("org/netbeans/modules/web/examples/Bundle").getString("LBL_NWP1_ProjectName_LabelMnemonic").charAt(0)); projectNameLabel.setLabelFor(projectNameTextField); - projectNameLabel.setText(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "LBL_NWP1_ProjectName_Label")); + projectNameLabel.setText(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "LBL_NWP1_ProjectName_Label")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(0, 0, 12, 0); add(projectNameLabel, gridBagConstraints); - gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.weightx = 1.0; gridBagConstraints.insets = new java.awt.Insets(0, 12, 12, 0); add(projectNameTextField, gridBagConstraints); - projectNameTextField.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "ACS_LBL_NWP1_ProjectName_A11YDesc")); + projectNameTextField.getAccessibleContext().setAccessibleDescription("null"); - projectLocationLabel.setDisplayedMnemonic(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "LBL_NWP1_ProjectLocation_LabelMnemonic").charAt(0)); + projectLocationLabel.setDisplayedMnemonic(java.util.ResourceBundle.getBundle("org/netbeans/modules/web/examples/Bundle").getString("LBL_NWP1_ProjectLocation_LabelMnemonic").charAt(0)); projectLocationLabel.setLabelFor(projectLocationTextField); - projectLocationLabel.setText(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "LBL_NWP1_ProjectLocation_Label")); + projectLocationLabel.setText(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "LBL_NWP1_ProjectLocation_Label")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridy = 1; gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(0, 0, 5, 0); add(projectLocationLabel, gridBagConstraints); - gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridy = 1; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; @@ -118,26 +114,25 @@ gridBagConstraints.weightx = 1.0; gridBagConstraints.insets = new java.awt.Insets(0, 12, 5, 0); add(projectLocationTextField, gridBagConstraints); - projectLocationTextField.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "ACS_LBL_NPW1_ProjectLocation_A11YDesc")); + projectLocationTextField.getAccessibleContext().setAccessibleDescription("null"); - Button.setText(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "LBL_NWP1_BrowseLocation_Button")); + Button.setText(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "LBL_NWP1_BrowseLocation_Button")); // NOI18N Button.setActionCommand("BROWSE"); Button.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { browseLocationAction(evt); } }); - gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridy = 1; gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.insets = new java.awt.Insets(0, 6, 5, 0); add(Button, gridBagConstraints); - Button.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "ACS_LBL_NWP1_BrowseLocation_A11YDesc")); + Button.getAccessibleContext().setAccessibleDescription("null"); - createdFolderLabel.setDisplayedMnemonic(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "LBL_NWP1_CreatedProjectFolder_LablelMnemonic").charAt(0)); + createdFolderLabel.setDisplayedMnemonic(java.util.ResourceBundle.getBundle("org/netbeans/modules/web/examples/Bundle").getString("LBL_NWP1_CreatedProjectFolder_LablelMnemonic").charAt(0)); createdFolderLabel.setLabelFor(createdFolderTextField); - createdFolderLabel.setText(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "LBL_NWP1_CreatedProjectFolder_Lablel")); + createdFolderLabel.setText(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "LBL_NWP1_CreatedProjectFolder_Lablel")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridheight = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; @@ -153,9 +148,8 @@ gridBagConstraints.weighty = 1.0; gridBagConstraints.insets = new java.awt.Insets(0, 12, 0, 0); add(createdFolderTextField, gridBagConstraints); - createdFolderTextField.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "ACS_LBL_NWP1_CreatedProjectFolder_A11YDesc")); - - }//GEN-END:initComponents + createdFolderTextField.getAccessibleContext().setAccessibleDescription("null"); + }// //GEN-END:initComponents private void browseLocationAction(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseLocationAction String command = evt.getActionCommand(); @@ -252,14 +246,6 @@ protected javax.swing.JTextField projectNameTextField; // End of variables declaration//GEN-END:variables - private static JFileChooser createChooser() { - JFileChooser chooser = new JFileChooser(); - chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); - chooser.setAcceptAllFileFilterUsed(false); - - return chooser; - } - private String validFreeProjectName(final File parentFolder, final String formater, final int index) { String name = MessageFormat.format(formater, new Object[] {new Integer (index)}); File file = new File(parentFolder, name); diff --git a/web.examples/src/org/netbeans/modules/web/examples/SettingsPanel.java b/web.examples/src/org/netbeans/modules/web/examples/SettingsPanel.java deleted file mode 100644 --- a/web.examples/src/org/netbeans/modules/web/examples/SettingsPanel.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * Contributor(s): - * - * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun - * Microsystems, Inc. All Rights Reserved. - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - */ - -package org.netbeans.modules.web.examples; - -import javax.swing.JPanel; -import org.openide.WizardDescriptor; - - -abstract class SettingsPanel extends JPanel { - - abstract void store (WizardDescriptor settings); - - abstract void read (WizardDescriptor settings); - - abstract boolean valid (WizardDescriptor settings); -} diff --git a/web.examples/src/org/netbeans/modules/web/examples/WebSampleProjectGenerator.java b/web.examples/src/org/netbeans/modules/web/examples/WebSampleProjectGenerator.java --- a/web.examples/src/org/netbeans/modules/web/examples/WebSampleProjectGenerator.java +++ b/web.examples/src/org/netbeans/modules/web/examples/WebSampleProjectGenerator.java @@ -42,7 +42,6 @@ package org.netbeans.modules.web.examples; import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -51,7 +50,6 @@ import java.util.zip.ZipInputStream; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.openide.filesystems.FileLock; - import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; import org.openide.xml.XMLUtil; diff --git a/web.examples/src/org/netbeans/modules/web/examples/WebSampleProjectIterator.java b/web.examples/src/org/netbeans/modules/web/examples/WebSampleProjectIterator.java --- a/web.examples/src/org/netbeans/modules/web/examples/WebSampleProjectIterator.java +++ b/web.examples/src/org/netbeans/modules/web/examples/WebSampleProjectIterator.java @@ -1,7 +1,42 @@ /* - * Main.java + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Created on April 6, 2004, 3:39 PM + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * Contributor(s): + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun + * Microsystems, Inc. All Rights Reserved. + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. */ package org.netbeans.modules.web.examples; diff --git a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/credits.html b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/credits.html --- a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/credits.html +++ b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor-toc.xml b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor-toc.xml --- a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor-toc.xml +++ b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor-toc.xml @@ -1,6 +1,6 @@ diff --git a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/display.html b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/display.html --- a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/display.html +++ b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/display.html @@ -1,6 +1,6 @@ diff --git a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/process.html b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/process.html --- a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/process.html +++ b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/process.html @@ -1,6 +1,6 @@ diff --git a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/resend.html b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/resend.html --- a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/resend.html +++ b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/resend.html @@ -1,6 +1,6 @@ diff --git a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/store.html b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/store.html --- a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/store.html +++ b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/store.html @@ -1,6 +1,6 @@ diff --git a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/view.html b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/view.html --- a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/view.html +++ b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/view.html @@ -1,6 +1,6 @@ diff --git a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitorMap.jhm b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitorMap.jhm --- a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitorMap.jhm +++ b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitorMap.jhm @@ -1,6 +1,6 @@ diff --git a/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/credits.html b/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/credits.html --- a/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/credits.html +++ b/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/refreshing-cached-refs.html b/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/refreshing-cached-refs.html --- a/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/refreshing-cached-refs.html +++ b/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/refreshing-cached-refs.html @@ -1,6 +1,6 @@ diff --git a/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/using-cpr.html b/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/using-cpr.html --- a/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/using-cpr.html +++ b/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/using-cpr.html @@ -1,6 +1,6 @@ diff --git a/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/ww-projectreferences.html b/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/ww-projectreferences.html --- a/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/ww-projectreferences.html +++ b/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/ww-projectreferences.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/about.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/about.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/about.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/about.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/credits.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/credits.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/credits.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/attribute.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/attribute.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/attribute.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/attribute.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/complextype.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/complextype.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/complextype.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/complextype.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/documentation.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/documentation.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/documentation.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/documentation.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/element.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/element.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/element.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/element.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/import-customizer.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/import-customizer.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/import-customizer.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/import-customizer.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/import.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/import.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/import.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/import.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/include-customizer.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/include-customizer.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/include-customizer.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/include-customizer.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/include.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/include.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/include.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/include.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/redefine-customizer.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/redefine-customizer.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/redefine-customizer.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/redefine-customizer.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/redefine.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/redefine.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/redefine.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/redefine.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/reference.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/reference.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/reference.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/reference.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/simpletype.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/simpletype.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/simpletype.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/simpletype.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/about.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/about.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/about.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/about.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/addingcomponents.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/addingcomponents.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/addingcomponents.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/addingcomponents.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/editingcomponents.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/editingcomponents.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/editingcomponents.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/editingcomponents.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/palette.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/palette.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/palette.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/palette.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/about.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/about.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/about.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/about.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/addingcomponents.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/addingcomponents.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/addingcomponents.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/addingcomponents.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/editingcomponents.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/editingcomponents.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/editingcomponents.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/editingcomponents.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/findingusages.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/findingusages.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/findingusages.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/findingusages.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/usingfind.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/usingfind.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/usingfind.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/usingfind.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingannotation.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingannotation.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingannotation.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingannotation.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingattributegroup.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingattributegroup.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingattributegroup.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingattributegroup.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingcompositors.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingcompositors.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingcompositors.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingcompositors.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingdocumentation.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingdocumentation.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingdocumentation.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingdocumentation.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingenumeration.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingenumeration.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingenumeration.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingenumeration.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalattribute.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalattribute.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalattribute.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalattribute.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalcomplextype.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalcomplextype.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalcomplextype.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalcomplextype.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalelement.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalelement.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalelement.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalelement.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalsimpletype.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalsimpletype.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalsimpletype.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalsimpletype.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinggroup.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinggroup.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinggroup.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinggroup.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingimport.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingimport.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingimport.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingimport.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinginclude.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinginclude.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinginclude.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinginclude.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalattribute.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalattribute.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalattribute.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalattribute.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalcomplextype.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalcomplextype.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalcomplextype.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalcomplextype.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalelement.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalelement.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalelement.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalelement.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalsimpletype.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalsimpletype.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalsimpletype.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalsimpletype.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingredefine.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingredefine.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingredefine.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingredefine.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingreference.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingreference.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingreference.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingreference.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/analyzingschemas.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/analyzingschemas.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/analyzingschemas.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/analyzingschemas.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/applyingdesignpatterns.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/applyingdesignpatterns.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/applyingdesignpatterns.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/applyingdesignpatterns.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/creatingxmlschema.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/creatingxmlschema.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/creatingxmlschema.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/creatingxmlschema.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/editingxmlschema.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/editingxmlschema.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/editingxmlschema.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/editingxmlschema.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingderivationsofglobct.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingderivationsofglobct.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingderivationsofglobct.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingderivationsofglobct.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingsubstgroups.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingsubstgroups.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingsubstgroups.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingsubstgroups.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingunusedcomponents.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingunusedcomponents.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingunusedcomponents.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingunusedcomponents.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/referencingextschemas.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/referencingextschemas.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/referencingextschemas.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/referencingextschemas.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/retrievingxmlresources.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/retrievingxmlresources.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/retrievingxmlresources.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/retrievingxmlresources.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-multi-schemas.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-multi-schemas.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-multi-schemas.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-multi-schemas.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-oneschema.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-oneschema.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-oneschema.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-oneschema.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-xml-catalog.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-xml-catalog.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-xml-catalog.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-xml-catalog.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingrefactoringforrenamedelete.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingrefactoringforrenamedelete.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingrefactoringforrenamedelete.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingrefactoringforrenamedelete.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/validatingxmlschema.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/validatingxmlschema.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/validatingxmlschema.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/validatingxmlschema.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/views_navigation.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/views_navigation.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/views_navigation.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/views_navigation.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_navigator.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_navigator.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_navigator.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_navigator.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlrefactoring.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlrefactoring.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlrefactoring.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlrefactoring.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlschemaquery.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlschemaquery.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlschemaquery.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlschemaquery.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlusages.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlusages.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlusages.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlusages.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/wiz/wiz_newxmlschema.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/wiz/wiz_newxmlschema.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/wiz/wiz_newxmlschema.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/wiz/wiz_newxmlschema.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/wiz/wiz_retrieveschemawsdl.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/wiz/wiz_retrieveschemawsdl.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/wiz/wiz_retrieveschemawsdl.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/wiz/wiz_retrieveschemawsdl.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/xmltools-javahelp-toc.xml b/xml.schema/javahelp/org/netbeans/modules/xml/schema/xmltools-javahelp-toc.xml --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/xmltools-javahelp-toc.xml +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/xmltools-javahelp-toc.xml @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/create_new_operation.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/create_new_operation.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/create_new_operation.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/create_new_operation.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/create_new_port_type.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/create_new_port_type.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/create_new_port_type.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/create_new_port_type.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/element_or_type.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/element_or_type.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/element_or_type.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/element_or_type.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/generate_binding_service_port.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/generate_binding_service_port.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/generate_binding_service_port.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/generate_binding_service_port.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_define_abstract.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_define_abstract.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_define_abstract.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_define_abstract.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_define_concrete.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_define_concrete.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_define_concrete.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_define_concrete.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_name_location.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_name_location.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_name_location.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_name_location.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/wsdlui-wsdlview-showusages.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/wsdlui-wsdlview-showusages.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/wsdlui-wsdlview-showusages.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/wsdlui-wsdlview-showusages.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_FTP.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_FTP.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_FTP.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_FTP.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_HTTP.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_HTTP.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_HTTP.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_HTTP.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_SOAP.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_SOAP.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_SOAP.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_SOAP.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/credits.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/credits.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/credits.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_bindings.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_bindings.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_bindings.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_bindings.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_bpel_ext.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_bpel_ext.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_bpel_ext.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_bpel_ext.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_code_completion.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_code_completion.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_code_completion.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_code_completion.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_config.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_config.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_config.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_config.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_creating.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_creating.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_creating.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_creating.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_creating_existing.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_creating_existing.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_creating_existing.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_creating_existing.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_data_types.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_data_types.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_data_types.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_data_types.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_documentation.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_documentation.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_documentation.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_documentation.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_find.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_find.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_find.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_find.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_import_schema.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_import_schema.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_import_schema.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_import_schema.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_import_wsdl.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_import_wsdl.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_import_wsdl.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_import_wsdl.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_messages.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_messages.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_messages.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_messages.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_ncname.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_ncname.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_ncname.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_ncname.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_layout.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_layout.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_layout.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_layout.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_messages.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_messages.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_messages.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_messages.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_messages_editing.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_messages_editing.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_messages_editing.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_messages_editing.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_nav.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_nav.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_nav.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_nav.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_top_bottom.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_top_bottom.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_top_bottom.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_top_bottom.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_types.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_types.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_types.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_types.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_types_editing.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_types_editing.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_types_editing.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_types_editing.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_port_types.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_port_types.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_port_types.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_port_types.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_prop.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_prop.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_prop.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_prop.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_refactoring.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_refactoring.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_refactoring.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_refactoring.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_root.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_root.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_root.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_root.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_services.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_services.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_services.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_services.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_source.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_source.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_source.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_source.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_validation.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_validation.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_validation.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_validation.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_views.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_views.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_views.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_views.html @@ -1,6 +1,6 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/about.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/about.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/about.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/about.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/credits.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/credits.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/credits.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

The contents of this file are subject to the terms of the Common Development and Distribution License (the License). You may not use this file except in compliance with the License.

You can obtain a copy of the License at http://www.netbeans.org/cddl.html or http://www.netbeans.org/cddl.txt.

When distributing Covered Code, include this CDDL Header Notice in each file and include the License file at http://www.netbeans.org/cddl.txt. If applicable, add the following below the CDDL Header, with the fields enclosed by brackets [] replaced by your own identifying information: "Portions Copyrighted [year] [name of copyright owner]"

-

The Original Software is NetBeans. The Initial Developer of the Original Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.

+

The Original Software is NetBeans. The Initial Developer of the Original Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

Note: Sun is not responsible for the availability of third-party web sites mentioned in this document and does not endorse and is not responsible or liable for any content, advertising, products, or other materials on or available from such sites or resources. Sun will not be responsible or liable for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods, or services available on or through any such sites or resources.

\ No newline at end of file diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/about.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/about.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/about.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/about.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/about.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/about.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/about.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/about.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/about.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/about.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/about.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/about.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/boolean.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/boolean.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/boolean.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/boolean.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/nodes.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/nodes.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/nodes.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/nodes.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/number.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/number.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/number.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/number.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/operator.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/operator.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/operator.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/operator.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/string.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/string.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/string.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/string.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/about.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/about.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/about.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/about.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/predicates.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/predicates.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/predicates.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/predicates.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/simplemap.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/simplemap.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/simplemap.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/simplemap.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/xpath.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/xpath.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/xpath.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/xpath.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/sourcetree.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/sourcetree.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/sourcetree.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/sourcetree.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/target/about.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/target/about.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/target/about.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/target/about.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/target/rules.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/target/rules.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/target/rules.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/target/rules.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/source.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/source.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/source.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/source.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/xpath.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/xpath.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/xpath.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/xpath.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/about.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/about.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/about.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/about.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/addxsl.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/addxsl.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/addxsl.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/addxsl.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/build.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/build.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/build.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/build.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/create.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/create.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/create.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/create.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/deploy.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/deploy.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/deploy.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/deploy.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/properties.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/properties.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/properties.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/properties.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/test.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/test.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/test.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/test.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-idx.xml b/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-idx.xml --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-idx.xml +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-idx.xml @@ -2,7 +2,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-map.jhm b/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-map.jhm --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-map.jhm +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-map.jhm @@ -2,7 +2,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-toc.xml b/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-toc.xml --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-toc.xml +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-toc.xml @@ -2,7 +2,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp.hs b/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp.hs --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp.hs +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp.hs @@ -1,6 +1,6 @@ # Date 1243704523 14400 # Node ID 4f1736add86940a20bfd77b5a66fdea9ad4852e4 # Parent 872fcfbaa237b00dd9b897f8c88ce4c35b61932a @RandomlyFails was not working in nbbuild unit tests. Also passing a workdir for NbTestCase. diff --git a/nbbuild/build.xml b/nbbuild/build.xml --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -1510,6 +1510,11 @@ + + + + + # HG changeset patch # User Jesse Glick # Date 1243956241 25200 # Node ID 28d8d7e8827facbb60fdfe0984dd7b2dcdb54f1a # Parent 4f1736add86940a20bfd77b5a66fdea9ad4852e4 Downgrade CNFE thrown when a *.instance file for a nonexistent class is encountered. Also try to clean up (if a file present in userdir). Could be helpful with issues like #163977. diff --git a/openide.loaders/src/org/openide/loaders/FolderInstance.java b/openide.loaders/src/org/openide/loaders/FolderInstance.java --- a/openide.loaders/src/org/openide/loaders/FolderInstance.java +++ b/openide.loaders/src/org/openide/loaders/FolderInstance.java @@ -46,13 +46,13 @@ import java.beans.PropertyChangeEvent; import java.io.IOException; import java.util.*; +import java.util.concurrent.Callable; import java.util.logging.Level; import java.util.logging.Logger; import org.netbeans.modules.openide.loaders.AWTTask; import org.openide.filesystems.*; import org.openide.cookies.InstanceCookie; -import org.openide.util.Exceptions; import org.openide.util.Task; import org.openide.util.TaskListener; import org.openide.util.RequestProcessor; @@ -415,6 +415,7 @@ InstanceCookie cookie; //Order of checking reversed first check cookie and then folder // test if we accept the instance + // XXX for subtle reasons, current test fails if this is changed to getLookup: cookie = dob.getCookie(InstanceCookie.class); try { cookie = cookie == null ? null : acceptCookie (cookie); @@ -422,10 +423,12 @@ } catch (IOException ex) { // an error during a call to acceptCookie err.log(Level.WARNING, null, ex); + revertProblematicFile(dob); cookie = null; } catch (ClassNotFoundException ex) { // an error during a call to acceptCookie - err.log(Level.WARNING, null, ex); + err.log(Level.INFO, null, ex); + revertProblematicFile(dob); cookie = null; } @@ -459,6 +462,16 @@ return cookie; } + private void revertProblematicFile(DataObject dob) { + Object rw = dob.getPrimaryFile().getAttribute("removeWritables"); // NOI18N + if (rw instanceof Callable) { + try { + ((Callable) rw).call(); + } catch (Exception x) { + err.log(Level.INFO, null, x); + } + } + } /** Allows subclasses to decide whether they want to work with * the specified InstanceCookie or not. # HG changeset patch # User Jesse Glick # Date 1244005428 25200 # Node ID 1c72d7bcf9f680d9f749c3d619848125d34ccc3c # Parent 308f6a2b90f228e9007998383b183bdc34f79e09 # Parent 28d8d7e8827facbb60fdfe0984dd7b2dcdb54f1a Automated merge with http://hg.netbeans.org/core-main/ diff --git a/nbbuild/build.xml b/nbbuild/build.xml --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -1510,6 +1510,11 @@ + + + + + diff --git a/openide.loaders/src/org/openide/loaders/FolderInstance.java b/openide.loaders/src/org/openide/loaders/FolderInstance.java --- a/openide.loaders/src/org/openide/loaders/FolderInstance.java +++ b/openide.loaders/src/org/openide/loaders/FolderInstance.java @@ -46,13 +46,13 @@ import java.beans.PropertyChangeEvent; import java.io.IOException; import java.util.*; +import java.util.concurrent.Callable; import java.util.logging.Level; import java.util.logging.Logger; import org.netbeans.modules.openide.loaders.AWTTask; import org.openide.filesystems.*; import org.openide.cookies.InstanceCookie; -import org.openide.util.Exceptions; import org.openide.util.Task; import org.openide.util.TaskListener; import org.openide.util.RequestProcessor; @@ -415,6 +415,7 @@ InstanceCookie cookie; //Order of checking reversed first check cookie and then folder // test if we accept the instance + // XXX for subtle reasons, current test fails if this is changed to getLookup: cookie = dob.getCookie(InstanceCookie.class); try { cookie = cookie == null ? null : acceptCookie (cookie); @@ -422,10 +423,12 @@ } catch (IOException ex) { // an error during a call to acceptCookie err.log(Level.WARNING, null, ex); + revertProblematicFile(dob); cookie = null; } catch (ClassNotFoundException ex) { // an error during a call to acceptCookie - err.log(Level.WARNING, null, ex); + err.log(Level.INFO, null, ex); + revertProblematicFile(dob); cookie = null; } @@ -459,6 +462,16 @@ return cookie; } + private void revertProblematicFile(DataObject dob) { + Object rw = dob.getPrimaryFile().getAttribute("removeWritables"); // NOI18N + if (rw instanceof Callable) { + try { + ((Callable) rw).call(); + } catch (Exception x) { + err.log(Level.INFO, null, x); + } + } + } /** Allows subclasses to decide whether they want to work with * the specified InstanceCookie or not. # HG changeset patch # User ffjre@netbeans.org # Date 1244013701 -7200 # Node ID 1e79acf59bd76887f1c7ac4798cd7e173d062816 # Parent d1ff01398ee552a3c86be8e97a3554a95d30b185 # Parent 1c72d7bcf9f680d9f749c3d619848125d34ccc3c Automated merge diff --git a/nbbuild/build.xml b/nbbuild/build.xml --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -1510,6 +1510,11 @@ + + + + + diff --git a/openide.loaders/src/org/openide/loaders/FolderInstance.java b/openide.loaders/src/org/openide/loaders/FolderInstance.java --- a/openide.loaders/src/org/openide/loaders/FolderInstance.java +++ b/openide.loaders/src/org/openide/loaders/FolderInstance.java @@ -46,13 +46,13 @@ import java.beans.PropertyChangeEvent; import java.io.IOException; import java.util.*; +import java.util.concurrent.Callable; import java.util.logging.Level; import java.util.logging.Logger; import org.netbeans.modules.openide.loaders.AWTTask; import org.openide.filesystems.*; import org.openide.cookies.InstanceCookie; -import org.openide.util.Exceptions; import org.openide.util.Task; import org.openide.util.TaskListener; import org.openide.util.RequestProcessor; @@ -415,6 +415,7 @@ InstanceCookie cookie; //Order of checking reversed first check cookie and then folder // test if we accept the instance + // XXX for subtle reasons, current test fails if this is changed to getLookup: cookie = dob.getCookie(InstanceCookie.class); try { cookie = cookie == null ? null : acceptCookie (cookie); @@ -422,10 +423,12 @@ } catch (IOException ex) { // an error during a call to acceptCookie err.log(Level.WARNING, null, ex); + revertProblematicFile(dob); cookie = null; } catch (ClassNotFoundException ex) { // an error during a call to acceptCookie - err.log(Level.WARNING, null, ex); + err.log(Level.INFO, null, ex); + revertProblematicFile(dob); cookie = null; } @@ -459,6 +462,16 @@ return cookie; } + private void revertProblematicFile(DataObject dob) { + Object rw = dob.getPrimaryFile().getAttribute("removeWritables"); // NOI18N + if (rw instanceof Callable) { + try { + ((Callable) rw).call(); + } catch (Exception x) { + err.log(Level.INFO, null, x); + } + } + } /** Allows subclasses to decide whether they want to work with * the specified InstanceCookie or not. # HG changeset patch # User ffjre@netbeans.org # Date 1244017202 -14400 # Node ID 8cf29320770a086d78885601000fb9a2a2f19ca9 # Parent 68c8cb6f8420f50b382e4839900cc35a4cb14c8b # Parent 1e79acf59bd76887f1c7ac4798cd7e173d062816 Automated merge with http://hg.netbeans.org/main diff --git a/ide.kit/test/qa-functional/src/org/netbeans/test/ide/CountingSecurityManager.java b/ide.kit/test/qa-functional/src/org/netbeans/test/ide/CountingSecurityManager.java --- a/ide.kit/test/qa-functional/src/org/netbeans/test/ide/CountingSecurityManager.java +++ b/ide.kit/test/qa-functional/src/org/netbeans/test/ide/CountingSecurityManager.java @@ -57,6 +57,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import junit.framework.Assert; +import org.openide.util.Utilities; /** * @@ -460,7 +461,10 @@ } } } - + if (file.endsWith("harness/modules/org-netbeans-modules-nbjunit.jar")) { + return false; + } + // mac osx dirs = System.getProperty("java.ext.dirs"); if (dirs != null) { @@ -470,6 +474,9 @@ } } } + if (Utilities.isMac() && file.startsWith("/System/Library/Frameworks/JavaVM.framework/")) { + return false; + } return true; } diff --git a/ide.kit/test/qa-functional/src/org/netbeans/test/ide/GeneralSanityTest.java b/ide.kit/test/qa-functional/src/org/netbeans/test/ide/GeneralSanityTest.java --- a/ide.kit/test/qa-functional/src/org/netbeans/test/ide/GeneralSanityTest.java +++ b/ide.kit/test/qa-functional/src/org/netbeans/test/ide/GeneralSanityTest.java @@ -73,6 +73,8 @@ } public static Test suite() { + // disable 'slowness detection' + System.setProperty("org.netbeans.core.TimeableEventQueue.quantum", "100000"); NbTestSuite s = new NbTestSuite(); s.addTest(new GeneralSanityTest("testInitBlacklistedClassesHandler")); s.addTest(NbModuleSuite.create( diff --git a/nbbuild/build.xml b/nbbuild/build.xml --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -1510,6 +1510,11 @@ + + + + + diff --git a/o.n.bootstrap/src/org/netbeans/Stamps.java b/o.n.bootstrap/src/org/netbeans/Stamps.java --- a/o.n.bootstrap/src/org/netbeans/Stamps.java +++ b/o.n.bootstrap/src/org/netbeans/Stamps.java @@ -91,6 +91,15 @@ stamp(false); return; } + if (args.length == 1 && "init".equals(args[0])) { // NOI18N + moduleJARs = null; + stamp(true); + return; + } + if (args.length == 1 && "clear".equals(args[0])) { // NOI18N + moduleJARs = null; + return; + } } private static final Stamps MODULES_JARS = new Stamps(); /** Creates instance of stamp that checks timestamp for all files that affect @@ -359,35 +368,46 @@ File configDir = new File(new File(cluster, "config"), "Modules"); // NOI18N File modulesDir = new File(cluster, "modules"); // NOI18N - - highestStampForDir(configDir, result); - highestStampForDir(modulesDir, result); + + AtomicLong clusterResult = new AtomicLong(); + if (highestStampForDir(configDir, clusterResult) && highestStampForDir(modulesDir, clusterResult)) { + // ok + } else { + if (!cluster.isDirectory()) { + // skip non-existing clusters` + return; + } + } + + if (clusterResult.longValue() > result.longValue()) { + result.set(clusterResult.longValue()); + } if (createStampFile) { try { stamp.getParentFile().mkdirs(); stamp.createNewFile(); - stamp.setLastModified(result.longValue()); + stamp.setLastModified(clusterResult.longValue()); } catch (IOException ex) { System.err.println("Cannot write timestamp to " + stamp); // NOI18N } } } - private static void highestStampForDir(File file, AtomicLong result) { + private static boolean highestStampForDir(File file, AtomicLong result) { File[] children = file.listFiles(); if (children == null) { long time = file.lastModified(); if (time > result.longValue()) { result.set(time); } - return; + return false; } for (File f : children) { highestStampForDir(f, result); } - + return true; } private static boolean compareAndUpdateFile(File file, String content, AtomicLong result) { diff --git a/o.n.bootstrap/test/unit/src/org/netbeans/StampsExtraTest.java b/o.n.bootstrap/test/unit/src/org/netbeans/StampsExtraTest.java new file mode 100644 --- /dev/null +++ b/o.n.bootstrap/test/unit/src/org/netbeans/StampsExtraTest.java @@ -0,0 +1,137 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2008 Sun Microsystems, Inc. + */ + +package org.netbeans; + +import java.io.File; +import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; +import junit.framework.Test; +import org.netbeans.junit.NbTestCase; +import org.netbeans.junit.NbTestSuite; + +/** + * + * @author Jaroslav Tulach + */ +public class StampsExtraTest extends NbTestCase { + private File userdir; + private File ide; + private File platform; + private File install; + private File extra; + + + public static Test suite() { + //return new StampsTest("testStampsInvalidatedWhenClustersChange"); + return new NbTestSuite(StampsExtraTest.class); + } + + public StampsExtraTest(String testName) { + super(testName); + } + + public void testTimeStampsWhenAddingCluster() throws Exception { + clearWorkDir(); + + install = new File(getWorkDir(), "install"); + platform = new File(install, "platform7"); + platform.mkdirs(); + ide = new File(install, "ide8"); + ide.mkdirs(); + extra = new File(install, "extra"); + userdir = new File(getWorkDir(), "tmp"); + userdir.mkdirs(); + + System.setProperty("netbeans.home", platform.getPath()); + System.setProperty("netbeans.dirs", ide.getPath() + File.pathSeparator + extra.getPath()); + System.setProperty("netbeans.user", userdir.getPath()); + + touch(platform, ".lastModified", 50000L); + touch(ide, ".lastModified", 90000L); + assertFalse("One cluster does not exists", extra.isDirectory()); + + Stamps.main("init"); + + Thread.sleep(100); + + Logger l = Logger.getLogger("org"); + l.setLevel(Level.OFF); + l.setUseParentHandlers(false); + + long stamp = Stamps.moduleJARs(); + assertEquals("Timestamp is taken from api.languages module", 90000L, stamp); + + Stamps.main("clear"); + + CountingSecurityManager.initialize(install.getPath()); + + long newStamp = Stamps.moduleJARs(); + + CountingSecurityManager.assertCounts("Just few accesses to installation", 6); + assertEquals("Stamps are the same", stamp, newStamp); + + File lastModifiedDir = new File(new File(new File(userdir, "var"), "cache"), "lastModified"); + File extraLM = new File(lastModifiedDir, "extra"); + assertFalse("File has not been created for non-existing cluster", extraLM.canRead()); + + extra.mkdirs(); + File lastModified = new File(extra, ".lastModified"); + lastModified.createNewFile(); + lastModified.setLastModified(200000L); + assertEquals("Correct last modified", 200000L, lastModified.lastModified()); + + Stamps.main("clear"); + stamp = Stamps.moduleJARs(); + if (stamp < 200000L) { + fail("lastModified has not been updated: " + stamp); + } + } + + private static void touch(File root, String rel, long time) throws IOException { + File f = new File(root, rel.replace('/', File.separatorChar)); + if (!f.exists()) { + f.getParentFile().mkdirs(); + f.createNewFile(); + } + f.setLastModified(time); + assertEquals("Correct last modified for " + f, time, f.lastModified()); + } +} diff --git a/o.n.bootstrap/test/unit/src/org/netbeans/StampsIdeLessThanPlatformTest.java b/o.n.bootstrap/test/unit/src/org/netbeans/StampsIdeLessThanPlatformTest.java new file mode 100644 --- /dev/null +++ b/o.n.bootstrap/test/unit/src/org/netbeans/StampsIdeLessThanPlatformTest.java @@ -0,0 +1,111 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2008 Sun Microsystems, Inc. + */ + +package org.netbeans; + +import java.io.File; +import java.util.logging.Level; +import java.util.logging.Logger; +import junit.framework.Test; +import org.netbeans.junit.NbTestCase; +import org.netbeans.junit.NbTestSuite; + +/** + * + * @author Jaroslav Tulach + */ +public class StampsIdeLessThanPlatformTest extends NbTestCase { + private File userdir; + private File ide; + private File platform; + private File install; + + + public static Test suite() { + //return new StampsTest("testStampsInvalidatedWhenClustersChange"); + return new NbTestSuite(StampsIdeLessThanPlatformTest.class); + } + + public StampsIdeLessThanPlatformTest(String testName) { + super(testName); + } + + @Override + protected void setUp() throws Exception { + clearWorkDir(); + + install = new File(getWorkDir(), "install"); + platform = new File(install, "platform7"); + ide = new File(install, "ide8"); + userdir = new File(getWorkDir(), "tmp"); + + System.setProperty("netbeans.home", platform.getPath()); + System.setProperty("netbeans.dirs", ide.getPath()); + System.setProperty("netbeans.user", userdir.getPath()); + + StampsTest.createModule("org.openide.awt", platform, 50000L); + StampsTest.createModule("org.openide.nodes", platform, 60000L); + StampsTest.createModule("org.netbeans.api.languages", ide, 50000L); + StampsTest.createModule("org.netbeans.modules.logmanagement", userdir, 10000L); + + Stamps.main("reset"); + + Thread.sleep(100); + + Logger l = Logger.getLogger("org"); + l.setLevel(Level.OFF); + l.setUseParentHandlers(false); + } + + @Override + protected void tearDown() throws Exception { + super.tearDown(); + } + + public void testGenerateTimeStamps() { + long stamp = Stamps.moduleJARs(); + assertEquals("Timestamp is taken from nodes module", 60000L, stamp); + + StampsTest.assertStamp(60000L, platform, false, true); + StampsTest.assertStamp(50000L, ide, false, true); + StampsTest.assertStamp(-1L, userdir, false, false); + } + + +} diff --git a/o.n.bootstrap/test/unit/src/org/netbeans/StampsTest.java b/o.n.bootstrap/test/unit/src/org/netbeans/StampsTest.java --- a/o.n.bootstrap/test/unit/src/org/netbeans/StampsTest.java +++ b/o.n.bootstrap/test/unit/src/org/netbeans/StampsTest.java @@ -45,7 +45,6 @@ import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.MappedByteBuffer; -import java.util.LinkedList; import java.util.concurrent.Semaphore; import java.util.logging.Level; import java.util.logging.Logger; @@ -558,9 +557,9 @@ } } } - - - private static void assertStamp(long expectedValue, File cluster, boolean global, boolean local) { + + + static void assertStamp(long expectedValue, File cluster, boolean global, boolean local) { File globalStamp = new File(cluster, ".lastModified"); File userDir = new File(System.getProperty("netbeans.user")); @@ -582,7 +581,7 @@ } - private void createModule(String cnb, File cluster, long accesTime) throws IOException { + static void createModule(String cnb, File cluster, long accesTime) throws IOException { String dashes = cnb.replace('.', '-'); File config = new File(new File(new File(cluster, "config"), "Modules"), dashes + ".xml"); diff --git a/o.n.core/arch.xml b/o.n.core/arch.xml --- a/o.n.core/arch.xml +++ b/o.n.core/arch.xml @@ -514,6 +514,12 @@ The context field is accessed from editor module by reflection from MultiKeymap. + + The module expects profiler to provide SelfProfileAction + and interacts with it as described in + profiler/test/unit/src/org/netbeans/modules/profiler/actions/SelfSamplerActionTest.java + test. +

diff --git a/o.n.core/src/org/netbeans/core/Bundle.properties b/o.n.core/src/org/netbeans/core/Bundle.properties --- a/o.n.core/src/org/netbeans/core/Bundle.properties +++ b/o.n.core/src/org/netbeans/core/Bundle.properties @@ -179,3 +179,9 @@ # NbAuthenticatorPanel NbAuthenticatorPanel.userNameLbl.text=&User Name: NbAuthenticatorPanel.passwordLbl.text=&Password: + +# TimableEventQueue +TEQ_LowPerformance=System slowness detected +# {0} time in ms +# {1} time in s +TEQ_BlockedFor=Not reponsive for {0,choice,0#{0} ms|5000#{1} s}. \ No newline at end of file diff --git a/o.n.core/src/org/netbeans/core/TimableEventQueue.java b/o.n.core/src/org/netbeans/core/TimableEventQueue.java --- a/o.n.core/src/org/netbeans/core/TimableEventQueue.java +++ b/o.n.core/src/org/netbeans/core/TimableEventQueue.java @@ -42,15 +42,32 @@ import java.awt.AWTEvent; import java.awt.EventQueue; import java.awt.Toolkit; -import java.util.EmptyStackException; -import java.util.Map; -import java.util.ResourceBundle; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.LinkedList; +import java.util.Queue; import java.util.logging.Level; -import java.util.logging.LogRecord; import java.util.logging.Logger; +import javax.swing.Action; import org.netbeans.core.startup.Main; +import org.openide.awt.Notification; +import org.openide.awt.NotificationDisplayer; +import org.openide.filesystems.FileObject; +import org.openide.filesystems.FileUtil; +import org.openide.loaders.DataObject; +import org.openide.nodes.Node; +import org.openide.util.ContextAwareAction; +import org.openide.util.Exceptions; +import org.openide.util.ImageUtilities; import org.openide.util.Mutex; +import org.openide.util.NbBundle; import org.openide.util.RequestProcessor; +import org.openide.util.lookup.Lookups; +import org.openide.windows.WindowManager; /** * Logging event queue that can report problems about too long execution times @@ -62,19 +79,20 @@ implements Runnable { private static final Logger LOG = Logger.getLogger(TimableEventQueue.class.getName()); private static final RequestProcessor RP = new RequestProcessor("Timeable Event Queue Watch Dog", 1, true); // NOI18N - private static final int QUANTUM = Integer.getInteger("org.netbeans.core.TimeableEventQueue.quantum", 5000); // NOI18N - private static final int PAUSE = Integer.getInteger("org.netbeans.core.TimeableEventQueue.pause", 60000); // NOI18N + private static final int QUANTUM = Integer.getInteger("org.netbeans.core.TimeableEventQueue.quantum", 100); // NOI18N + private static final int REPORT = Integer.getInteger("org.netbeans.core.TimeableEventQueue.report", 1000); // NOI18N + private static final int PAUSE = Integer.getInteger("org.netbeans.core.TimeableEventQueue.pause", 15000); // NOI18N - private final RequestProcessor.Task TIMEOUT; - private volatile Map stack; private volatile long ignoreTill; private volatile long start; - + private volatile ActionListener stoppable; + private final Queue pending; public TimableEventQueue() { TIMEOUT = RP.create(this); TIMEOUT.setPriority(Thread.MIN_PRIORITY); + pending = new LinkedList(); } static void initialize() { @@ -97,74 +115,86 @@ e.printStackTrace(); } } + @Override protected void dispatchEvent(AWTEvent event) { try { - tick(); + tick("dispatchEvent"); // NOI18N super.dispatchEvent(event); } finally { done(); } } - @Override - public void postEvent(AWTEvent theEvent) { - try { - tick(); - super.postEvent(theEvent); - } finally { - done(); - } - } - - @Override - public synchronized void push(EventQueue newEventQueue) { - try { - tick(); - super.push(newEventQueue); - } finally { - done(); - } - } - private void done() { - stack = null; TIMEOUT.cancel(); long time = System.currentTimeMillis() - start; - if (time > 50) { - LOG.log(Level.FINE, "done, timer stopped, took {0}", time); + if (time > QUANTUM) { + LOG.log(Level.FINE, "done, timer stopped, took {0}", time); // NOI18N + if (time > REPORT) { + LOG.log(Level.WARNING, "too much time in AWT thread {0}", stoppable); // NOI18N + ActionListener ss = stoppable; + if (ss != null) { + try { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + DataOutputStream dos = new DataOutputStream(out); + ss.actionPerformed(new ActionEvent(dos, 0, "write")); // NOI18N + dos.close(); + pending.add(new NotifySnapshot(out.toByteArray(), time)); + if (pending.size() > 5) { + pending.remove().clear(); + } + stoppable = null; + } catch (Exception ex) { + Exceptions.printStackTrace(ex); + } + ignoreTill = System.currentTimeMillis() + PAUSE; + } + } } else { LOG.log(Level.FINEST, "done, timer stopped, took {0}", time); } + ActionListener ss = stoppable; + if (ss != null) { + ss.actionPerformed(new ActionEvent(this, 0, "cancel")); // NOI18N + stoppable = null; + } + return; } - private void tick() { - stack = null; + private void tick(String name) { start = System.currentTimeMillis(); - if (start >= ignoreTill) { - LOG.log(Level.FINEST, "tick, schedule a timer at {0}", start); + if (start >= ignoreTill && WindowManager.getDefault().getMainWindow().isShowing()) { + LOG.log(Level.FINEST, "tick, schedule a timer for {0}", name); TIMEOUT.schedule(QUANTUM); } } public void run() { - stack = Thread.getAllStackTraces(); - LOG.log(Level.FINER, "timer running"); - for (int i = 0; i < 10; i++) { - if (Thread.interrupted()) { - LOG.log(Level.FINER, "timer cancelled"); - return; - } - Thread.yield(); - System.gc(); - System.runFinalization(); - } - final Map myStack = stack; - if (myStack == null) { - LOG.log(Level.FINER, "timer cancelled"); + if (stoppable != null) { + LOG.log(Level.WARNING, "Still previous controller {0}", stoppable); return; } - + Runnable selfSampler = (Runnable)createSelfSampler(); + if (selfSampler != null) { + selfSampler.run(); + stoppable = (ActionListener)selfSampler; + } + } + + private static Object createSelfSampler() { + FileObject fo = FileUtil.getConfigFile("Actions/Profile/org-netbeans-modules-profiler-actions-SelfSamplerAction.instance"); + if (fo == null) { + return null; + } + Action a = (Action)fo.getAttribute("delegate"); // NOI18N + if (a == null) { + return null; + } + return a.getValue("logger-awt"); // NOI18N + } + + /* long now = System.currentTimeMillis(); ignoreTill = now + PAUSE; long howLong = now - start; @@ -179,7 +209,7 @@ // UI_LOG.log(rec); LOG.log(rec); } - + private static final class EQException extends Exception { private volatile Map stack; @@ -243,4 +273,41 @@ } } + */ + + private static final class NotifySnapshot implements ActionListener { + private final byte[] content; + private final Notification note; + + NotifySnapshot(byte[] arr, long time) { + content = arr; + note = NotificationDisplayer.getDefault().notify( + NbBundle.getMessage(NotifySnapshot.class, "TEQ_LowPerformance"), + ImageUtilities.loadImageIcon("org/netbeans/core/resources/vilik.png", true), + NbBundle.getMessage(NotifySnapshot.class, "TEQ_BlockedFor", time, time / 1000), + this, NotificationDisplayer.Priority.LOW + ); + } + + public void actionPerformed(ActionEvent e) { + try { + FileObject fo = FileUtil.createMemoryFileSystem().getRoot().createData("slow.nps"); + OutputStream os = fo.getOutputStream(); + os.write(content); + os.close(); + final Node obj = DataObject.find(fo).getNodeDelegate(); + Action a = obj.getPreferredAction(); + if (a instanceof ContextAwareAction) { + a = ((ContextAwareAction)a).createContextAwareInstance(Lookups.singleton(obj)); + } + a.actionPerformed(e); + } catch (IOException ex) { + Exceptions.printStackTrace(ex); + } + } + + public void clear() { + note.clear(); + } + } } diff --git a/o.n.core/src/org/netbeans/core/resources/vilik.png b/o.n.core/src/org/netbeans/core/resources/vilik.png new file mode 100644 index 0000000000000000000000000000000000000000..bacd931f5face49bdb50845a35c1396e88b21af8 GIT binary patch literal 876 zc$@)j1C#uTP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2iXN0 z2oM21cdWAj000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0008VNkl3nvV2lz)9wLg)KrK^gdntX;LT~B4vndhX5dY*PCnx#O`Sa&L5?>$z z^?(7W0z5#B6(BC_e*+T0x*|DKoEre4*js=SzPY-Dr+^>mD=|un4sKBt#Jakw`i_nr zCq+q2b$9RT>FXPN45&*a;af@P&;RP(zf-xAT`=y==b}@?|A>#fkNcZ?d;13iflUqD zxBb2^7>ub!^_t-;Ig%v#{q1*~n;SQpOr?az{;I8X#oN7J^Bbqr(x$4pXd;o3T(0sx z(P(N!*Y)sn53pD)Cb!%DQ+c@)S(Y&vojA%^1-f48l+|c7sh&Q4pkrwG^4~pwwELC} zVqJrMO=rM&RuF_zB^FX6k%+0Kr3K?c3{}$>pFMl8xZO5WXlh37I?{S%{QX4YW^exx zfZ+95>#tq$KW}T>T7{M-mrFA+S_O#^N+^TSEs_^ z*&zVw&vV;;?(7U4M&1sE7zRP1)|Eyqna5mvhMCy~c_I1Ypw*c1RFrA9L%XXz^V!@{ zU!x;FJQ{mxFq_LX#0n@VphW;k&EU}$h8Iv}i+^$qJCCXdV7WwV(Ao@$G4I+9TlgrSkqSkJo;@sBGmScYbx zvY5b9;5ML1-?3mGSPjTP8Ylp%?@_Syd}6UwK>r`!qzkE&Kr99T0000= 0; - } - assertTrue("Slow is in the stack trace", found); } private static final class CountingHandler extends Handler { diff --git a/openide.loaders/src/org/openide/loaders/FolderInstance.java b/openide.loaders/src/org/openide/loaders/FolderInstance.java --- a/openide.loaders/src/org/openide/loaders/FolderInstance.java +++ b/openide.loaders/src/org/openide/loaders/FolderInstance.java @@ -46,13 +46,13 @@ import java.beans.PropertyChangeEvent; import java.io.IOException; import java.util.*; +import java.util.concurrent.Callable; import java.util.logging.Level; import java.util.logging.Logger; import org.netbeans.modules.openide.loaders.AWTTask; import org.openide.filesystems.*; import org.openide.cookies.InstanceCookie; -import org.openide.util.Exceptions; import org.openide.util.Task; import org.openide.util.TaskListener; import org.openide.util.RequestProcessor; @@ -415,6 +415,7 @@ InstanceCookie cookie; //Order of checking reversed first check cookie and then folder // test if we accept the instance + // XXX for subtle reasons, current test fails if this is changed to getLookup: cookie = dob.getCookie(InstanceCookie.class); try { cookie = cookie == null ? null : acceptCookie (cookie); @@ -422,10 +423,12 @@ } catch (IOException ex) { // an error during a call to acceptCookie err.log(Level.WARNING, null, ex); + revertProblematicFile(dob); cookie = null; } catch (ClassNotFoundException ex) { // an error during a call to acceptCookie - err.log(Level.WARNING, null, ex); + err.log(Level.INFO, null, ex); + revertProblematicFile(dob); cookie = null; } @@ -459,6 +462,16 @@ return cookie; } + private void revertProblematicFile(DataObject dob) { + Object rw = dob.getPrimaryFile().getAttribute("removeWritables"); // NOI18N + if (rw instanceof Callable) { + try { + ((Callable) rw).call(); + } catch (Exception x) { + err.log(Level.INFO, null, x); + } + } + } /** Allows subclasses to decide whether they want to work with * the specified InstanceCookie or not. diff --git a/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java b/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java --- a/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java +++ b/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java @@ -39,7 +39,9 @@ package org.netbeans.performance.scalability; +import java.io.File; import java.io.FileDescriptor; +import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; import java.security.Permission; @@ -48,6 +50,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicLong; import junit.framework.Assert; +import org.openide.util.Exceptions; /** * @@ -78,6 +81,12 @@ msgs = new StringWriter(); pw = new PrintWriter(msgs); CountingSecurityManager.prefix = prefix; + try { + CountingSecurityManager.prefix = new File(prefix).getCanonicalPath(); + } catch (IOException ex) { + Exceptions.printStackTrace(ex); + } + System.err.println("setting prefix to " + CountingSecurityManager.prefix); Statistics.reset(); } diff --git a/performance/test/unit/src/org/netbeans/performance/scalability/ExpandFolderTest.java b/performance/test/unit/src/org/netbeans/performance/scalability/ExpandFolderTest.java --- a/performance/test/unit/src/org/netbeans/performance/scalability/ExpandFolderTest.java +++ b/performance/test/unit/src/org/netbeans/performance/scalability/ExpandFolderTest.java @@ -79,6 +79,7 @@ Configuration config = NbModuleSuite.createConfiguration(ExpandFolderTest.class) .clusters(clusters) .enableModules(modules) + .honorAutoloadEager(true) .gui(false); return NbModuleSuite.create(config); } diff --git a/profiler/src/org/netbeans/modules/profiler/actions/SelfSamplerAction.java b/profiler/src/org/netbeans/modules/profiler/actions/SelfSamplerAction.java --- a/profiler/src/org/netbeans/modules/profiler/actions/SelfSamplerAction.java +++ b/profiler/src/org/netbeans/modules/profiler/actions/SelfSamplerAction.java @@ -42,13 +42,18 @@ import java.awt.Toolkit; import java.awt.event.AWTEventListener; import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.awt.event.KeyEvent; +import java.io.DataOutputStream; +import java.nio.channels.WritableByteChannel; import java.util.Collections; +import java.util.concurrent.Callable; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicReference; import javax.swing.AbstractAction; import javax.swing.Action; import org.netbeans.lib.profiler.common.ProfilingSettingsPresets; @@ -56,6 +61,7 @@ import org.netbeans.lib.profiler.results.cpu.StackTraceSnapshotBuilder; import org.netbeans.modules.profiler.LoadedSnapshot; import org.netbeans.modules.profiler.ResultsManager; +import org.openide.util.Exceptions; import org.openide.util.ImageUtilities; import org.openide.util.NbBundle; @@ -74,12 +80,7 @@ private static final String ACTION_NAME_STOP = NbBundle.getMessage(SelfSamplerAction.class, "SelfSamplerAction_ActionNameStop"); // private static final String ACTION_DESCR = NbBundle.getMessage(SelfSamplerAction.class, "SelfSamplerAction_ActionDescription"); private static final String THREAD_NAME = NbBundle.getMessage(SelfSamplerAction.class, "SelfSamplerAction_ThreadName"); - private StackTraceSnapshotBuilder builder; - private ThreadFactory threadFactory; - private ScheduledExecutorService executor; - - private AtomicBoolean isRunning = new AtomicBoolean(false); - private long startTime; + private final AtomicReference RUNNING = new AtomicReference(); //~ Constructors ------------------------------------------------------------------------------------------------------------- private SelfSamplerAction() { @@ -101,24 +102,6 @@ //~ Methods ------------------------------------------------------------------------------------------------------------------ - /** - * @return the builder - */ - private synchronized StackTraceSnapshotBuilder getBuilder() { - if (builder == null) { - builder = new StackTraceSnapshotBuilder(); - threadFactory = new ThreadFactory() { - public Thread newThread(Runnable r) { - return new Thread(r, THREAD_NAME); - } - }; - builder.setIgnoredThreads(Collections.singleton(THREAD_NAME)); - } - return builder; - } - - - @Override public boolean isEnabled() { return true; @@ -128,42 +111,23 @@ * Invoked when an action occurs. */ public void actionPerformed(final ActionEvent e) { - if (isRunning.compareAndSet(false, true)) { + Controller c; + if (RUNNING.compareAndSet(null, c = new Controller(THREAD_NAME))) { putValue(Action.NAME, ACTION_NAME_STOP); putValue(Action.SMALL_ICON, ImageUtilities.loadImageIcon( "org/netbeans/modules/profiler/actions/resources/modifyProfiling.png" //NOI18N - , false) + , false) ); - final StackTraceSnapshotBuilder b = getBuilder(); - executor = Executors.newSingleThreadScheduledExecutor(threadFactory); - startTime = System.currentTimeMillis(); - executor.scheduleAtFixedRate(new Runnable() { - public void run() { - b.addStacktrace(Thread.getAllStackTraces(), System.nanoTime()); - } - }, 10, 10, TimeUnit.MILLISECONDS); - } else if (isRunning.compareAndSet(true, false)) { + c.run(); + } else if ((c = RUNNING.getAndSet(null)) != null) { putValue(Action.NAME, ACTION_NAME_START); putValue(Action.SMALL_ICON, ImageUtilities.loadImageIcon( "org/netbeans/modules/profiler/actions/resources/openSnapshot.png" //NOI18N - , false) + , false) ); - try { - executor.shutdown(); - executor.awaitTermination(100, TimeUnit.MILLISECONDS); - CPUResultsSnapshot snapshot = getBuilder().createSnapshot(startTime, System.nanoTime()); - LoadedSnapshot loadedSnapshot = new LoadedSnapshot(snapshot, ProfilingSettingsPresets.createCPUPreset(), null, null); - loadedSnapshot.setSaved(true); - ResultsManager.getDefault().openSnapshot(loadedSnapshot); - getBuilder().reset(); - - } catch (CPUResultsSnapshot.NoDataAvailableException ex) { - ex.printStackTrace(); - } catch (InterruptedException ex) { - Thread.currentThread().interrupt(); - } + c.actionPerformed(new ActionEvent(this, 0, "show")); // NOI18N } } @@ -176,5 +140,75 @@ } } + @Override + public Object getValue(String key) { + Object o = super.getValue(key); + if (o == null && key.startsWith("logger-")) { // NOI18N + return new Controller(key); + } + return o; + } + + + private static final class Controller implements Runnable, ActionListener { + private final String name; + private StackTraceSnapshotBuilder builder; + private ThreadFactory threadFactory; + private ScheduledExecutorService executor; + private long startTime; + + public Controller(String n) { + name = n; + } + /** + * @return the builder + */ + private synchronized StackTraceSnapshotBuilder getBuilder() { + if (builder == null) { + builder = new StackTraceSnapshotBuilder(); + threadFactory = new ThreadFactory() { + public Thread newThread(Runnable r) { + return new Thread(r, name); + } + }; + builder.setIgnoredThreads(Collections.singleton(name)); + } + return builder; + } + + public void run() { + final StackTraceSnapshotBuilder b = getBuilder(); + executor = Executors.newSingleThreadScheduledExecutor(threadFactory); + startTime = System.currentTimeMillis(); + executor.scheduleAtFixedRate(new Runnable() { + public void run() { + b.addStacktrace(Thread.getAllStackTraces(), System.nanoTime()); + } + }, 10, 10, TimeUnit.MILLISECONDS); + } + + public void actionPerformed(ActionEvent e) { + try { + executor.shutdown(); + executor.awaitTermination(100, TimeUnit.MILLISECONDS); + if ("cancel".equals(e.getActionCommand())) { + return; + } + CPUResultsSnapshot snapshot = getBuilder().createSnapshot(startTime, System.nanoTime()); + LoadedSnapshot loadedSnapshot = new LoadedSnapshot(snapshot, ProfilingSettingsPresets.createCPUPreset(), null, null); + if ("write".equals(e.getActionCommand())) { + DataOutputStream dos = (DataOutputStream)e.getSource(); + loadedSnapshot.save(dos); + return; + } + loadedSnapshot.setSaved(true); + ResultsManager.getDefault().openSnapshot(loadedSnapshot); + } catch (Exception ex) { + Exceptions.printStackTrace(ex); + } finally { + getBuilder().reset(); + } + } + } } diff --git a/profiler/test/unit/src/org/netbeans/modules/profiler/actions/SelfSamplerActionTest.java b/profiler/test/unit/src/org/netbeans/modules/profiler/actions/SelfSamplerActionTest.java new file mode 100644 --- /dev/null +++ b/profiler/test/unit/src/org/netbeans/modules/profiler/actions/SelfSamplerActionTest.java @@ -0,0 +1,137 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.profiler.actions; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.DataOutputStream; +import java.io.OutputStream; +import java.util.logging.Level; +import javax.swing.Action; +import org.junit.Test; +import org.netbeans.junit.Log; +import org.netbeans.modules.profiler.ui.NpsDataObject; +import org.openide.cookies.OpenCookie; +import org.openide.filesystems.FileObject; +import org.openide.filesystems.FileUtil; +import org.openide.loaders.DataObject; +import static org.junit.Assert.*; + +/** Shows how o.n.core uses the SelfSamplerAction to start and stop self profiling. + * + * @author Jaroslav Tulach + */ +public class SelfSamplerActionTest { + + public SelfSamplerActionTest() { + } + + @Test + public void testSelfProfileToStream() throws Exception { + FileObject afo = FileUtil.getConfigFile("Actions/Profile/org-netbeans-modules-profiler-actions-SelfSamplerAction.instance"); + assertNotNull("SelfSamplerAction is in the right fileobject", afo); + Action a = (Action)afo.getAttribute("delegate"); // NOI18N + Object obj = a.getValue("logger-testprofile"); + assertTrue("It is runnable", obj instanceof Runnable); + assertTrue("It is action listener", obj instanceof ActionListener); + + Runnable r = (Runnable)obj; + ActionListener al = (ActionListener)obj; + + r.run(); + Thread.sleep(1000); + assertLoggerThread("logger-testprofile shall be there", true); + + FileObject fo = FileUtil.createMemoryFileSystem().getRoot().createData("slow.nps"); + OutputStream os = fo.getOutputStream(); + DataOutputStream dos = new DataOutputStream(os); + al.actionPerformed(new ActionEvent(dos, 0, "write")); // NOI18N + dos.close(); + + if (fo.getSize() < 100) { + fail("The file shall have real content: " + fo.getSize()); + } + + DataObject dataObject = DataObject.find(fo); + assertEquals("Nps DataObject", NpsDataObject.class, dataObject.getClass()); + OpenCookie oc = dataObject.getLookup().lookup(OpenCookie.class); + assertNotNull("Open cookie exists", oc); + + CharSequence log = Log.enable("", Level.WARNING); + oc.open(); + + if (log.length() > 0) { + fail("There shall be no warnings:\n" + log); + } + + assertLoggerThread("no logger- thread shall be there", false); + } + + @Test + public void testSelfProfileCancel() throws Exception { + SelfSamplerAction result = SelfSamplerAction.getInstance(); + Object obj = result.getValue("logger-testprofile"); + assertTrue("It is runnable", obj instanceof Runnable); + assertTrue("It is action listener", obj instanceof ActionListener); + + Runnable r = (Runnable)obj; + ActionListener al = (ActionListener)obj; + + r.run(); + Thread.sleep(1000); + assertLoggerThread("logger-testprofile shall be there", true); + + al.actionPerformed(new ActionEvent(this, 0, "cancel")); // NOI18N + + assertLoggerThread("no logger- thread shall be there", false); + } + + private void assertLoggerThread(String msg, boolean exist) { + for (Thread t : Thread.getAllStackTraces().keySet()) { + if (t.getName().startsWith("logger-")) { + assertTrue(msg + "There is " + t.getName() + " thread", exist); + return; + } + } + assertFalse(msg + "There is no logger- thread", exist); + } + + +} \ No newline at end of file diff --git a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindSubclassesTest.java b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindSubclassesTest.java --- a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindSubclassesTest.java +++ b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindSubclassesTest.java @@ -56,7 +56,6 @@ import org.netbeans.junit.Log; import org.netbeans.junit.NbModuleSuite; import org.netbeans.junit.NbPerformanceTest; -import org.netbeans.modules.refactoring.api.Problem; import org.netbeans.modules.refactoring.api.RefactoringElement; import org.netbeans.modules.refactoring.api.RefactoringSession; import org.netbeans.modules.refactoring.api.WhereUsedQuery; @@ -102,7 +101,6 @@ timer = Logger.getLogger("TIMER.RefactoringPrepare"); timer.setLevel(Level.FINE); timer.addHandler(getHandler()); - ClasspathInfo cp = ClasspathInfo.create(boot, compile, source); Log.enableInstances(Logger.getLogger("TIMER"), "JavacParser", Level.FINEST); FileObject testFile = getProjectDir().getFileObject("/src/simplej2seapp/Main.java"); @@ -121,7 +119,8 @@ ClasspathInfo cpi = RetoucheUtils.getClasspathInfoFor(TreePathHandle.create(object, controller)); wuq[0].getContext().add(cpi); } - }, false); + }, false).get(); + wuq[0].putValue(WhereUsedQueryConstants.FIND_SUBCLASSES, true); RefactoringSession rs = RefactoringSession.create("Session"); wuq[0].prepare(rs); @@ -130,8 +129,8 @@ StringBuilder sb = new StringBuilder(); sb.append("Symbol: '").append(symbolName[0]).append("'"); sb.append('\n').append("Number of usages: ").append(elems.size()).append('\n'); - long prepare = getHandler().get("refactoring.prepare"); try { + long prepare = getHandler().get("refactoring.prepare"); NbPerformanceTest.PerformanceData d = new NbPerformanceTest.PerformanceData(); d.name = "refactoring.prepare"+" (" + symbolName[0] + ", usages:" + elems.size() + ")"; d.value = prepare; @@ -152,6 +151,6 @@ } public static Test suite() throws InterruptedException { - return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(FindSubclassesTest.class, "testFindSub").gui(true)); + return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(FindSubclassesTest.class, "testFindSub").gui(false)); } } \ No newline at end of file diff --git a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindUsagesPerfTest.java b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindUsagesPerfTest.java --- a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindUsagesPerfTest.java +++ b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindUsagesPerfTest.java @@ -90,7 +90,7 @@ // find usages of symbols collected below final List handle = new ArrayList(); - src.runUserActionTask(new Task() { + src.runWhenScanFinished(new Task() { public void run(CompilationController controller) throws Exception { controller.toPhase(JavaSource.Phase.RESOLVED); @@ -99,12 +99,12 @@ handle.add(TreePathHandle.create(element, controller)); } } - }, false); + }, false).get(); // do find usages query for (final TreePathHandle element : handle) { - src.runUserActionTask(new Task() { + src.runWhenScanFinished(new Task() { public void run(CompilationController controller) throws Exception { controller.toPhase(JavaSource.Phase.RESOLVED); @@ -140,7 +140,7 @@ System.err.println(sb); } - }, false); + }, false).get(); System.gc(); System.gc(); } src = null; diff --git a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/MoveClassPerfTest.java b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/MoveClassPerfTest.java --- a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/MoveClassPerfTest.java +++ b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/MoveClassPerfTest.java @@ -92,7 +92,7 @@ final MoveRefactoring[] moveRef = new MoveRefactoring[1]; final CharSequence REFACTORED_OBJ = "org.gjt.sp.jedit.ActionSet"; - src.runUserActionTask(new Task() { + src.runWhenScanFinished(new Task() { public void run(CompilationController controller) throws Exception { controller.toPhase(JavaSource.Phase.RESOLVED); @@ -101,7 +101,7 @@ ClasspathInfo cpi = RetoucheUtils.getClasspathInfoFor(TreePathHandle.create(klass, controller)); moveRef[0].getContext().add(cpi); } - }, false); + }, false).get(); RefactoringSession rs = RefactoringSession.create("Session"); File f = FileUtil.toFile(getProjectDir().getFileObject("/src/org/gjt/sp")); @@ -136,6 +136,6 @@ } public static Test suite() throws InterruptedException { - return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(MoveClassPerfTest.class, "testMoveActionSet").gui(true)); + return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(MoveClassPerfTest.class, "testMoveActionSet").gui(false)); } } \ No newline at end of file diff --git a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/OpenDocumentsPerfTest.java b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/OpenDocumentsPerfTest.java --- a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/OpenDocumentsPerfTest.java +++ b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/OpenDocumentsPerfTest.java @@ -55,8 +55,6 @@ import org.netbeans.junit.Log; import org.netbeans.junit.NbModuleSuite; import org.netbeans.junit.NbPerformanceTest; -import org.netbeans.modules.java.source.usages.ClassIndexManager; -import org.netbeans.modules.refactoring.api.Problem; import org.netbeans.modules.refactoring.api.RefactoringElement; import org.netbeans.modules.refactoring.api.RefactoringSession; import org.netbeans.modules.refactoring.api.WhereUsedQuery; @@ -146,6 +144,6 @@ } public static Test suite() throws InterruptedException { - return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(OpenDocumentsPerfTest.class, "testOpenDocuments").gui(true)); + return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(OpenDocumentsPerfTest.class, "testOpenDocuments").gui(false)); } } \ No newline at end of file # HG changeset patch # User Dmitry Lipin # Date 1244035990 -14400 # Node ID c0636ab261dc13fc14c07cc5ef80d9c51e73158b # Parent 8cf29320770a086d78885601000fb9a2a2f19ca9 6.7 Beta -> 6.7 RC diff --git a/installer/infra/build/web/js/build_info.js b/installer/infra/build/web/js/build_info.js --- a/installer/infra/build/web/js/build_info.js +++ b/installer/infra/build/web/js/build_info.js @@ -61,7 +61,7 @@ build_info.USE_HTML_ZIP_LISTING = 0; build_info.add_download_tabs = function() { add_download_tab("6.5.1", "http://www.netbeans.org/downloads"); - add_download_tab("6.7 Beta", "http://download.netbeans.org/netbeans/6.7/beta"); + add_download_tab("6.7 RC", "http://download.netbeans.org/netbeans/6.7/rc"); add_download_tab(DEVELOPMENT_TITLE /*,DEVELOPMENT_BUILDS_LINK*/); add_download_tab(ARCHIVE_TITLE,ARCHIVE_BUILDS_LINK); } # HG changeset patch # User Milos Kleint # Date 1244014263 -7200 # Node ID 170df48c8ef3a443938018113ce8a5e1294805da # Parent df951716de1e6909fa651fca79378209a131a24d #160378 cut the commons-logging bits out of the maven-embedder binary diff --git a/maven.embedder/external/binaries-list b/maven.embedder/external/binaries-list --- a/maven.embedder/external/binaries-list +++ b/maven.embedder/external/binaries-list @@ -1,3 +1,3 @@ -51FB6C9E571AD75CD870E05A41557F9208243C08 maven-embedder-2.1-20080623-patched.jar +DEC63D07DDDC152C588C2CFB7950D947FDAA0C73 maven-embedder-2.1-20080623-patched.jar A2AC1CD690AB4C80DEFE7F9BCE14D35934C35CEC jdom-1.0.jar 653A6AD1EF786BC577FC20F56E5F2B1D30423805 maven-dependency-tree-1.2.jar diff --git a/maven.embedder/nbproject/project.xml b/maven.embedder/nbproject/project.xml --- a/maven.embedder/nbproject/project.xml +++ b/maven.embedder/nbproject/project.xml @@ -40,7 +40,6 @@ Version 2 license, then the option applies only if the new code is made subject to such option by the copyright holder. --> - org.netbeans.modules.apisupport.project @@ -57,6 +56,15 @@ + org.netbeans.libs.commons_logging + + + + 1 + 1.8 + + + org.openide.dialogs # HG changeset patch # User Milos Kleint # Date 1244018714 -7200 # Node ID c284039569f74f2ea8ddb381bbabbda8dcfccee0 # Parent 170df48c8ef3a443938018113ce8a5e1294805da #165695 cannot have empty library name, disable Ok if it happens diff --git a/maven/src/org/netbeans/modules/maven/actions/Bundle.properties b/maven/src/org/netbeans/modules/maven/actions/Bundle.properties --- a/maven/src/org/netbeans/modules/maven/actions/Bundle.properties +++ b/maven/src/org/netbeans/modules/maven/actions/Bundle.properties @@ -49,3 +49,5 @@ MSG_Downloading=Downloading {0} MSG_Downloading_javadoc=Downloading javadoc {0} MSG_Downloading_sources=Downloading sources {0} +ERR_NameExists=Library with given name already exists. +ERR_EmptyName=Library Name cannot be empty. diff --git a/maven/src/org/netbeans/modules/maven/actions/CreateLibraryAction.java b/maven/src/org/netbeans/modules/maven/actions/CreateLibraryAction.java --- a/maven/src/org/netbeans/modules/maven/actions/CreateLibraryAction.java +++ b/maven/src/org/netbeans/modules/maven/actions/CreateLibraryAction.java @@ -109,7 +109,8 @@ final MavenProject project = lookup.lookup(MavenProject.class); final CreateLibraryPanel pnl = new CreateLibraryPanel(root); DialogDescriptor dd = new DialogDescriptor(pnl, NbBundle.getMessage(CreateLibraryPanel.class, "LBL_CreateLibrary")); - pnl.setLineSupport(dd.createNotificationLineSupport()); + pnl.setLineSupport(dd.createNotificationLineSupport(), dd); + if (DialogDisplayer.getDefault().notify(dd) == DialogDescriptor.OK_OPTION) { RequestProcessor.getDefault().post(new Runnable() { public void run() { diff --git a/maven/src/org/netbeans/modules/maven/actions/CreateLibraryPanel.java b/maven/src/org/netbeans/modules/maven/actions/CreateLibraryPanel.java --- a/maven/src/org/netbeans/modules/maven/actions/CreateLibraryPanel.java +++ b/maven/src/org/netbeans/modules/maven/actions/CreateLibraryPanel.java @@ -43,7 +43,6 @@ import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.io.File; import java.util.ArrayList; import java.util.Comparator; import java.util.List; @@ -64,8 +63,10 @@ import org.netbeans.modules.maven.dependencies.CheckNode; import org.netbeans.modules.maven.dependencies.CheckNodeListener; import org.netbeans.modules.maven.dependencies.CheckRenderer; +import org.openide.DialogDescriptor; import org.openide.NotificationLineSupport; import org.openide.util.ImageUtilities; +import org.openide.util.NbBundle; /** * @@ -74,6 +75,7 @@ public class CreateLibraryPanel extends javax.swing.JPanel { private DependencyNode rootnode; private NotificationLineSupport line; + private DialogDescriptor dd; /** Creates new form CreateLibraryPanel */ CreateLibraryPanel(DependencyNode root) { @@ -121,8 +123,9 @@ }); } - void setLineSupport(NotificationLineSupport notificationLineSupport) { + void setLineSupport(NotificationLineSupport notificationLineSupport, DialogDescriptor dd) { line = notificationLineSupport; + this.dd = dd; } @@ -135,7 +138,7 @@ private void setLibraryName() { LibraryManager manager = (LibraryManager) comManager.getSelectedItem(); - String currentName = txtName.getText(); + String currentName = getLibraryName(); int index = 0; while (currentName.trim().length() == 0 || manager.getLibrary(currentName.trim()) != null) { currentName = rootnode.getArtifact().getArtifactId(); @@ -144,7 +147,7 @@ } index++; } - if (!currentName.equals(txtName.getText())) { + if (!currentName.equals(getLibraryName())) { txtName.setText(currentName); } } @@ -152,11 +155,17 @@ private void checkLibraryName() { LibraryManager manager = (LibraryManager) comManager.getSelectedItem(); - String currentName = txtName.getText(); - if (manager.getLibrary(currentName) != null) { - line.setErrorMessage("Library with given name already exists."); + String currentName = getLibraryName(); + if (currentName.length() == 0) { + line.setErrorMessage(NbBundle.getMessage(CreateLibraryPanel.class, "ERR_EmptyName")); + dd.setValid(false); + } + else if (manager.getLibrary(currentName) != null) { + line.setErrorMessage(NbBundle.getMessage(CreateLibraryPanel.class, "ERR_NameExists")); + dd.setValid(false); } else { line.clearMessages(); + dd.setValid(true); } } /** This method is called from within the constructor to @@ -257,7 +266,11 @@ } String getLibraryName() { - return txtName.getText(); + String name = txtName.getText().trim(); +// if (name.length() == 0) { +// name = "library"; //NOI18N +// } + return name; } boolean isAllSourceAndJavadoc() { @@ -268,7 +281,7 @@ if (!cbCopy.isSelected()) { return null; } - String dir = txtName.getText().trim(); + String dir = getLibraryName(); return dir; } @@ -302,6 +315,7 @@ return 0; } + private static class Comp implements Comparator { public int compare(Artifact a1, Artifact a2) { @@ -335,8 +349,8 @@ private DefaultMutableTreeNode rootNode; private DependencyNode root; private Stack path; - private Icon icn = ImageUtilities.image2Icon(ImageUtilities.loadImage("org/netbeans/modules/maven/TransitiveDependencyIcon.png", true)); - private Icon icn2 = ImageUtilities.image2Icon(ImageUtilities.loadImage("org/netbeans/modules/maven/DependencyIcon.png", true)); + private Icon icn = ImageUtilities.image2Icon(ImageUtilities.loadImage("org/netbeans/modules/maven/TransitiveDependencyIcon.png", true)); //NOI18N + private Icon icn2 = ImageUtilities.image2Icon(ImageUtilities.loadImage("org/netbeans/modules/maven/DependencyIcon.png", true)); //NOI18N Visitor(DefaultMutableTreeNode root) { this.rootNode = root; # HG changeset patch # User Milos Kleint # Date 1244030390 -7200 # Node ID c26e9e1146e01923857f2cad00aa3e20f2815c1d # Parent c284039569f74f2ea8ddb381bbabbda8dcfccee0 small refactoring to allow experimenting with direct execution of maven (without the shell script (bat) mediator.. the default behaviour stays the same diff --git a/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java b/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java --- a/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java +++ b/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java @@ -52,6 +52,9 @@ import hidden.org.codehaus.plexus.util.cli.CommandLineUtils; import java.net.URL; import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.netbeans.api.progress.ProgressHandle; import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.maven.api.execute.ActiveJ2SEPlatformProvider; @@ -59,6 +62,9 @@ import org.netbeans.modules.maven.api.execute.ExecutionResultChecker; import org.netbeans.modules.maven.api.execute.LateBoundPrerequisitesChecker; import org.netbeans.modules.maven.api.execute.RunUtils; +import org.netbeans.modules.maven.execute.cmd.Constructor; +import org.netbeans.modules.maven.execute.cmd.DirectConstructor; +import org.netbeans.modules.maven.execute.cmd.ShellConstructor; import org.netbeans.spi.project.ui.support.BuildExecutionSupport; import org.openide.awt.HtmlBrowser; import org.openide.filesystems.FileObject; @@ -210,17 +216,6 @@ } } - // we run the shell/bat script in the process, on windows we need to quote any spaces - //once/if we get rid of shell/bat execution, we might need to remove this - //#164234 - private static String quoteSpaces(String val, String quote) { - if (val.indexOf(' ') != -1) { //NOI18N - if (Utilities.isWindows()) { - return quote + val + quote; //NOI18N - } - } - return val; - } public boolean cancel() { @@ -235,8 +230,7 @@ return true; } - private static List createMavenExecutionCommand(RunConfig config) { - File mavenHome = MavenSettings.getDefault().getCommandLinePath(); + private static List createMavenExecutionCommand(RunConfig config, Constructor base) { //#164234 //if maven.bat file is in space containing path, we need to quote with simple quotes. String quote = "\""; @@ -244,22 +238,7 @@ // correctly to the java runtime on windows String escaped = "\\" + quote; List toRet = new ArrayList(); - String ex = Utilities.isWindows() ? "mvn.bat" : "mvn"; //NOI18N - if (mavenHome != null) { - File bin = new File(mavenHome, "bin" + File.separator + ex);//NOI18N - if (bin.exists()) { - toRet.add(quoteSpaces(bin.getAbsolutePath(), quote)); - } else { - toRet.add(ex); - } - } else { - toRet.add(ex); - } - - if (Utilities.isWindows() && Boolean.getBoolean("maven.run.cmd")) { //#153101 - toRet.add(0, "/c"); //NOI18N - toRet.add(0, "cmd"); //NOI18N - } + toRet.addAll(base.construct()); for (Object key : config.getProperties().keySet()) { String val = config.getProperties().getProperty((String)key); @@ -351,25 +330,20 @@ } private ProcessBuilder constructBuilder(final RunConfig clonedConfig, InputOutput ioput) { - List cmdLine = createMavenExecutionCommand(clonedConfig); - ProcessBuilder builder = new ProcessBuilder(cmdLine); - builder.redirectErrorStream(true); - builder.directory(clonedConfig.getExecutionDirectory()); - ioput.getOut().println("NetBeans: Executing '" + StringUtils.join(builder.command().iterator(), " ") + "'"); //NOI18N - to be shown in log. - boolean hasJavaSet = false; + File javaHome = null; + Map envMap = new HashMap(); for (Object key : clonedConfig.getProperties().keySet()) { String keyStr = (String) key; if (keyStr.startsWith(ENV_PREFIX)) { String env = keyStr.substring(ENV_PREFIX.length()); String val = clonedConfig.getProperties().getProperty(keyStr); - builder.environment().put(env, val); - ioput.getOut().println("NetBeans: " + env + "=" + val); + envMap.put(env, val); if (keyStr.equals(ENV_JAVAHOME)) { - hasJavaSet = true; + javaHome = new File(val); } } } - if (!hasJavaSet) { + if (javaHome == null) { if (clonedConfig.getProject() != null) { //TODO somehow use the config.getMavenProject() call rather than looking up the // ActiveJ2SEPlatformProvider from lookup. The loaded project can be different from the executed one. @@ -381,23 +355,53 @@ for (FileObject fo : objs) { if (FileUtil.isParentOf(fo, java)) { path = FileUtil.toFile(fo); + if (path != null) { + javaHome = path; + envMap.put(ENV_JAVAHOME.substring(ENV_PREFIX.length()), path.getAbsolutePath()); + } break; } } } - if (path != null) { - builder.environment().put(ENV_JAVAHOME.substring(ENV_PREFIX.length()), path.getAbsolutePath()); - ioput.getOut().println("NetBeans: JAVA_HOME =" + path.getAbsolutePath()); - hasJavaSet = true; + } + //#151559 + if (javaHome == null) { + if (System.getenv("JAVA_HOME") == null) { + //NOI18N + javaHome = new File(System.getProperty("java.home")); + envMap.put("JAVA_HOME", javaHome.getAbsolutePath()); //NOI18N + } else { + javaHome = new File(System.getenv("JAVA_HOME")); + envMap.put("JAVA_HOME", javaHome.getAbsolutePath()); //NOI18N } } - //#151559 - if (!hasJavaSet && System.getenv("JAVA_HOME") == null) { - //NOI18N - builder.environment().put("JAVA_HOME", System.getProperty("java.home")); //NOI18N - ioput.getOut().println("NetBeans: JAVA_HOME =" + System.getProperty("java.home")); - } } + + File mavenHome = MavenSettings.getDefault().getCommandLinePath(); + Constructor constructeur; + + if (Boolean.getBoolean("maven.direct")) { + //TODO don't assume we know the path to mvn.. + DefaultArtifactVersion dav = new DefaultArtifactVersion(MavenSettings.getCommandLineMavenVersion()); + constructeur = new DirectConstructor(dav, javaHome, mavenHome); + } else { + constructeur = new ShellConstructor(mavenHome); + } + + List cmdLine = createMavenExecutionCommand(clonedConfig, constructeur); + + ProcessBuilder builder = new ProcessBuilder(cmdLine); + builder.redirectErrorStream(true); + builder.directory(clonedConfig.getExecutionDirectory()); + ioput.getOut().println("NetBeans: Executing '" + StringUtils.join(builder.command().iterator(), " ") + "'"); //NOI18N - to be shown in log. + for (Map.Entry entry : envMap.entrySet()) { + String env = entry.getKey(); + String val = entry.getValue(); + // TODO: do we really put *all* the env vars there? maybe filter, M2_HOME and JDK_HOME? + builder.environment().put(env, val); + ioput.getOut().println("NetBeans: " + env + "=" + val); + } + return builder; } diff --git a/maven/src/org/netbeans/modules/maven/execute/cmd/Constructor.java b/maven/src/org/netbeans/modules/maven/execute/cmd/Constructor.java new file mode 100644 --- /dev/null +++ b/maven/src/org/netbeans/modules/maven/execute/cmd/Constructor.java @@ -0,0 +1,50 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.maven.execute.cmd; + +import java.util.List; + +/** + * + * @author mkleint + */ +public interface Constructor { + List construct(); +} diff --git a/maven/src/org/netbeans/modules/maven/execute/cmd/DirectConstructor.java b/maven/src/org/netbeans/modules/maven/execute/cmd/DirectConstructor.java new file mode 100644 --- /dev/null +++ b/maven/src/org/netbeans/modules/maven/execute/cmd/DirectConstructor.java @@ -0,0 +1,141 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.maven.execute.cmd; + +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import org.apache.maven.artifact.versioning.ArtifactVersion; +import org.apache.maven.artifact.versioning.DefaultArtifactVersion; +import org.openide.util.Utilities; + +/** + * + * @author mkleint + */ +public class DirectConstructor implements Constructor { + private final ArtifactVersion version; + private final File javaExec; + private final File mavenHome; + //#164234 + //if maven.bat file is in space containing path, we need to quote with simple quotes. + String quote = "\""; + // the command line parameters with space in them need to be quoted and escaped to arrive + // correctly to the java runtime on windows + String escaped = "\\" + quote; + + public DirectConstructor(ArtifactVersion version, File javaExec, File mavenHome) { + this.version = version; + this.javaExec = javaExec; + this.mavenHome = mavenHome; + } + + public List construct() { + List toRet = new ArrayList(); + toRet.add(getJavaCmd()); + toRet.addAll(getM2OPTS()); + toRet.addAll(getClassPath()); + toRet.add(getClassWorldsConf()); + toRet.add(getMavenHome()); + toRet.add(getClassWorldLauncher()); + return toRet; + } + + protected String getJavaCmd() { + //TODO we should better pass the java eec directly from the j2seplatform.. + File bin = new File(javaExec, "bin"); + File java = new File(bin, "java"); + return quoteSpaces(java.getAbsolutePath(), quote); + } + + protected List getM2OPTS() { + //TODO - will need to split the content and quote it properly? + return Collections.emptyList(); + } + + protected List getClassPath() { + // in 2.0.5 it's core/boot.. do we care? + File bootParent = new File(mavenHome, "boot"); + File[] boots = bootParent.listFiles(); + List toRet = new ArrayList(); + toRet.add("-classpath"); + if (boots != null && boots.length > 0) { + StringBuffer path = new StringBuffer(); + for (File boot : boots) { + path.append(boot.getAbsolutePath()).append(":"); + } + path.setLength(path.length() - 1); + toRet.add(path.toString()); + return toRet; + } + throw new IllegalArgumentException("Wrong maven.home=" + mavenHome); + } + + protected String getClassWorldsConf() { + //TODO quoting? + return "-Dclassworlds.conf=" + mavenHome.getAbsolutePath() + File.separator + "bin" + File.separator + "m2.conf"; //NOI18N + + } + + protected String getMavenHome() { + return "-Dmaven.home=" + mavenHome.getAbsolutePath(); + } + + protected String getClassWorldLauncher() { + DefaultArtifactVersion dav = new DefaultArtifactVersion("3.0-alpha-2"); //NOI18N + if (version.compareTo(dav) >= 0) { //in 3.0 + return "org.codehaus.plexus.classworlds.launcher.Launcher"; //NOI18N + } + return "org.codehaus.classworlds.Launcher"; //NOI18N + } + + + // we run the shell/bat script in the process, on windows we need to quote any spaces + //once/if we get rid of shell/bat execution, we might need to remove this + //#164234 + private static String quoteSpaces(String val, String quote) { + if (Utilities.isWindows() && val.indexOf(' ') != -1) { //NOI18N + return quote + val + quote; //NOI18N + } + return val; + } + +} diff --git a/maven/src/org/netbeans/modules/maven/execute/cmd/ShellConstructor.java b/maven/src/org/netbeans/modules/maven/execute/cmd/ShellConstructor.java new file mode 100644 --- /dev/null +++ b/maven/src/org/netbeans/modules/maven/execute/cmd/ShellConstructor.java @@ -0,0 +1,98 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.maven.execute.cmd; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import org.openide.util.Utilities; + +/** + * + * @author mkleint + */ +public class ShellConstructor implements Constructor { + private final File mavenHome; + + public ShellConstructor(File mavenHome) { + this.mavenHome = mavenHome; + } + + public List construct() { + //#164234 + //if maven.bat file is in space containing path, we need to quote with simple quotes. + String quote = "\""; + // the command line parameters with space in them need to be quoted and escaped to arrive + // correctly to the java runtime on windows + String escaped = "\\" + quote; + List toRet = new ArrayList(); + String ex = Utilities.isWindows() ? "mvn.bat" : "mvn"; //NOI18N + if (mavenHome != null) { + File bin = new File(mavenHome, "bin" + File.separator + ex);//NOI18N + if (bin.exists()) { + toRet.add(quoteSpaces(bin.getAbsolutePath(), quote)); + } else { + toRet.add(ex); + } + } else { + toRet.add(ex); + } + + if (Utilities.isWindows() && Boolean.getBoolean("maven.run.cmd")) { //#153101 + toRet.add(0, "/c"); //NOI18N + toRet.add(0, "cmd"); //NOI18N + } + return toRet; + } + + // we run the shell/bat script in the process, on windows we need to quote any spaces + //once/if we get rid of shell/bat execution, we might need to remove this + //#164234 + private static String quoteSpaces(String val, String quote) { + if (val.indexOf(' ') != -1) { //NOI18N + if (Utilities.isWindows()) { + return quote + val + quote; //NOI18N + } + } + return val; + } + + +} # HG changeset patch # User Milos Kleint # Date 1244032228 -7200 # Node ID 9e5dd1a3fa552885e75fc990f00e7519af4565b6 # Parent 8cf29320770a086d78885601000fb9a2a2f19ca9 # Parent c26e9e1146e01923857f2cad00aa3e20f2815c1d Automated merge with file:///home/mkleint/src/hg-incoming/main diff --git a/maven.embedder/external/binaries-list b/maven.embedder/external/binaries-list --- a/maven.embedder/external/binaries-list +++ b/maven.embedder/external/binaries-list @@ -1,3 +1,3 @@ -51FB6C9E571AD75CD870E05A41557F9208243C08 maven-embedder-2.1-20080623-patched.jar +DEC63D07DDDC152C588C2CFB7950D947FDAA0C73 maven-embedder-2.1-20080623-patched.jar A2AC1CD690AB4C80DEFE7F9BCE14D35934C35CEC jdom-1.0.jar 653A6AD1EF786BC577FC20F56E5F2B1D30423805 maven-dependency-tree-1.2.jar diff --git a/maven.embedder/nbproject/project.xml b/maven.embedder/nbproject/project.xml --- a/maven.embedder/nbproject/project.xml +++ b/maven.embedder/nbproject/project.xml @@ -40,7 +40,6 @@ Version 2 license, then the option applies only if the new code is made subject to such option by the copyright holder. --> - org.netbeans.modules.apisupport.project @@ -57,6 +56,15 @@ + org.netbeans.libs.commons_logging + + + + 1 + 1.8 + + + org.openide.dialogs diff --git a/maven/src/org/netbeans/modules/maven/actions/Bundle.properties b/maven/src/org/netbeans/modules/maven/actions/Bundle.properties --- a/maven/src/org/netbeans/modules/maven/actions/Bundle.properties +++ b/maven/src/org/netbeans/modules/maven/actions/Bundle.properties @@ -49,3 +49,5 @@ MSG_Downloading=Downloading {0} MSG_Downloading_javadoc=Downloading javadoc {0} MSG_Downloading_sources=Downloading sources {0} +ERR_NameExists=Library with given name already exists. +ERR_EmptyName=Library Name cannot be empty. diff --git a/maven/src/org/netbeans/modules/maven/actions/CreateLibraryAction.java b/maven/src/org/netbeans/modules/maven/actions/CreateLibraryAction.java --- a/maven/src/org/netbeans/modules/maven/actions/CreateLibraryAction.java +++ b/maven/src/org/netbeans/modules/maven/actions/CreateLibraryAction.java @@ -109,7 +109,8 @@ final MavenProject project = lookup.lookup(MavenProject.class); final CreateLibraryPanel pnl = new CreateLibraryPanel(root); DialogDescriptor dd = new DialogDescriptor(pnl, NbBundle.getMessage(CreateLibraryPanel.class, "LBL_CreateLibrary")); - pnl.setLineSupport(dd.createNotificationLineSupport()); + pnl.setLineSupport(dd.createNotificationLineSupport(), dd); + if (DialogDisplayer.getDefault().notify(dd) == DialogDescriptor.OK_OPTION) { RequestProcessor.getDefault().post(new Runnable() { public void run() { diff --git a/maven/src/org/netbeans/modules/maven/actions/CreateLibraryPanel.java b/maven/src/org/netbeans/modules/maven/actions/CreateLibraryPanel.java --- a/maven/src/org/netbeans/modules/maven/actions/CreateLibraryPanel.java +++ b/maven/src/org/netbeans/modules/maven/actions/CreateLibraryPanel.java @@ -43,7 +43,6 @@ import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.io.File; import java.util.ArrayList; import java.util.Comparator; import java.util.List; @@ -64,8 +63,10 @@ import org.netbeans.modules.maven.dependencies.CheckNode; import org.netbeans.modules.maven.dependencies.CheckNodeListener; import org.netbeans.modules.maven.dependencies.CheckRenderer; +import org.openide.DialogDescriptor; import org.openide.NotificationLineSupport; import org.openide.util.ImageUtilities; +import org.openide.util.NbBundle; /** * @@ -74,6 +75,7 @@ public class CreateLibraryPanel extends javax.swing.JPanel { private DependencyNode rootnode; private NotificationLineSupport line; + private DialogDescriptor dd; /** Creates new form CreateLibraryPanel */ CreateLibraryPanel(DependencyNode root) { @@ -121,8 +123,9 @@ }); } - void setLineSupport(NotificationLineSupport notificationLineSupport) { + void setLineSupport(NotificationLineSupport notificationLineSupport, DialogDescriptor dd) { line = notificationLineSupport; + this.dd = dd; } @@ -135,7 +138,7 @@ private void setLibraryName() { LibraryManager manager = (LibraryManager) comManager.getSelectedItem(); - String currentName = txtName.getText(); + String currentName = getLibraryName(); int index = 0; while (currentName.trim().length() == 0 || manager.getLibrary(currentName.trim()) != null) { currentName = rootnode.getArtifact().getArtifactId(); @@ -144,7 +147,7 @@ } index++; } - if (!currentName.equals(txtName.getText())) { + if (!currentName.equals(getLibraryName())) { txtName.setText(currentName); } } @@ -152,11 +155,17 @@ private void checkLibraryName() { LibraryManager manager = (LibraryManager) comManager.getSelectedItem(); - String currentName = txtName.getText(); - if (manager.getLibrary(currentName) != null) { - line.setErrorMessage("Library with given name already exists."); + String currentName = getLibraryName(); + if (currentName.length() == 0) { + line.setErrorMessage(NbBundle.getMessage(CreateLibraryPanel.class, "ERR_EmptyName")); + dd.setValid(false); + } + else if (manager.getLibrary(currentName) != null) { + line.setErrorMessage(NbBundle.getMessage(CreateLibraryPanel.class, "ERR_NameExists")); + dd.setValid(false); } else { line.clearMessages(); + dd.setValid(true); } } /** This method is called from within the constructor to @@ -257,7 +266,11 @@ } String getLibraryName() { - return txtName.getText(); + String name = txtName.getText().trim(); +// if (name.length() == 0) { +// name = "library"; //NOI18N +// } + return name; } boolean isAllSourceAndJavadoc() { @@ -268,7 +281,7 @@ if (!cbCopy.isSelected()) { return null; } - String dir = txtName.getText().trim(); + String dir = getLibraryName(); return dir; } @@ -302,6 +315,7 @@ return 0; } + private static class Comp implements Comparator { public int compare(Artifact a1, Artifact a2) { @@ -335,8 +349,8 @@ private DefaultMutableTreeNode rootNode; private DependencyNode root; private Stack path; - private Icon icn = ImageUtilities.image2Icon(ImageUtilities.loadImage("org/netbeans/modules/maven/TransitiveDependencyIcon.png", true)); - private Icon icn2 = ImageUtilities.image2Icon(ImageUtilities.loadImage("org/netbeans/modules/maven/DependencyIcon.png", true)); + private Icon icn = ImageUtilities.image2Icon(ImageUtilities.loadImage("org/netbeans/modules/maven/TransitiveDependencyIcon.png", true)); //NOI18N + private Icon icn2 = ImageUtilities.image2Icon(ImageUtilities.loadImage("org/netbeans/modules/maven/DependencyIcon.png", true)); //NOI18N Visitor(DefaultMutableTreeNode root) { this.rootNode = root; diff --git a/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java b/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java --- a/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java +++ b/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java @@ -52,6 +52,9 @@ import hidden.org.codehaus.plexus.util.cli.CommandLineUtils; import java.net.URL; import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.netbeans.api.progress.ProgressHandle; import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.maven.api.execute.ActiveJ2SEPlatformProvider; @@ -59,6 +62,9 @@ import org.netbeans.modules.maven.api.execute.ExecutionResultChecker; import org.netbeans.modules.maven.api.execute.LateBoundPrerequisitesChecker; import org.netbeans.modules.maven.api.execute.RunUtils; +import org.netbeans.modules.maven.execute.cmd.Constructor; +import org.netbeans.modules.maven.execute.cmd.DirectConstructor; +import org.netbeans.modules.maven.execute.cmd.ShellConstructor; import org.netbeans.spi.project.ui.support.BuildExecutionSupport; import org.openide.awt.HtmlBrowser; import org.openide.filesystems.FileObject; @@ -210,17 +216,6 @@ } } - // we run the shell/bat script in the process, on windows we need to quote any spaces - //once/if we get rid of shell/bat execution, we might need to remove this - //#164234 - private static String quoteSpaces(String val, String quote) { - if (val.indexOf(' ') != -1) { //NOI18N - if (Utilities.isWindows()) { - return quote + val + quote; //NOI18N - } - } - return val; - } public boolean cancel() { @@ -235,8 +230,7 @@ return true; } - private static List createMavenExecutionCommand(RunConfig config) { - File mavenHome = MavenSettings.getDefault().getCommandLinePath(); + private static List createMavenExecutionCommand(RunConfig config, Constructor base) { //#164234 //if maven.bat file is in space containing path, we need to quote with simple quotes. String quote = "\""; @@ -244,22 +238,7 @@ // correctly to the java runtime on windows String escaped = "\\" + quote; List toRet = new ArrayList(); - String ex = Utilities.isWindows() ? "mvn.bat" : "mvn"; //NOI18N - if (mavenHome != null) { - File bin = new File(mavenHome, "bin" + File.separator + ex);//NOI18N - if (bin.exists()) { - toRet.add(quoteSpaces(bin.getAbsolutePath(), quote)); - } else { - toRet.add(ex); - } - } else { - toRet.add(ex); - } - - if (Utilities.isWindows() && Boolean.getBoolean("maven.run.cmd")) { //#153101 - toRet.add(0, "/c"); //NOI18N - toRet.add(0, "cmd"); //NOI18N - } + toRet.addAll(base.construct()); for (Object key : config.getProperties().keySet()) { String val = config.getProperties().getProperty((String)key); @@ -351,25 +330,20 @@ } private ProcessBuilder constructBuilder(final RunConfig clonedConfig, InputOutput ioput) { - List cmdLine = createMavenExecutionCommand(clonedConfig); - ProcessBuilder builder = new ProcessBuilder(cmdLine); - builder.redirectErrorStream(true); - builder.directory(clonedConfig.getExecutionDirectory()); - ioput.getOut().println("NetBeans: Executing '" + StringUtils.join(builder.command().iterator(), " ") + "'"); //NOI18N - to be shown in log. - boolean hasJavaSet = false; + File javaHome = null; + Map envMap = new HashMap(); for (Object key : clonedConfig.getProperties().keySet()) { String keyStr = (String) key; if (keyStr.startsWith(ENV_PREFIX)) { String env = keyStr.substring(ENV_PREFIX.length()); String val = clonedConfig.getProperties().getProperty(keyStr); - builder.environment().put(env, val); - ioput.getOut().println("NetBeans: " + env + "=" + val); + envMap.put(env, val); if (keyStr.equals(ENV_JAVAHOME)) { - hasJavaSet = true; + javaHome = new File(val); } } } - if (!hasJavaSet) { + if (javaHome == null) { if (clonedConfig.getProject() != null) { //TODO somehow use the config.getMavenProject() call rather than looking up the // ActiveJ2SEPlatformProvider from lookup. The loaded project can be different from the executed one. @@ -381,23 +355,53 @@ for (FileObject fo : objs) { if (FileUtil.isParentOf(fo, java)) { path = FileUtil.toFile(fo); + if (path != null) { + javaHome = path; + envMap.put(ENV_JAVAHOME.substring(ENV_PREFIX.length()), path.getAbsolutePath()); + } break; } } } - if (path != null) { - builder.environment().put(ENV_JAVAHOME.substring(ENV_PREFIX.length()), path.getAbsolutePath()); - ioput.getOut().println("NetBeans: JAVA_HOME =" + path.getAbsolutePath()); - hasJavaSet = true; + } + //#151559 + if (javaHome == null) { + if (System.getenv("JAVA_HOME") == null) { + //NOI18N + javaHome = new File(System.getProperty("java.home")); + envMap.put("JAVA_HOME", javaHome.getAbsolutePath()); //NOI18N + } else { + javaHome = new File(System.getenv("JAVA_HOME")); + envMap.put("JAVA_HOME", javaHome.getAbsolutePath()); //NOI18N } } - //#151559 - if (!hasJavaSet && System.getenv("JAVA_HOME") == null) { - //NOI18N - builder.environment().put("JAVA_HOME", System.getProperty("java.home")); //NOI18N - ioput.getOut().println("NetBeans: JAVA_HOME =" + System.getProperty("java.home")); - } } + + File mavenHome = MavenSettings.getDefault().getCommandLinePath(); + Constructor constructeur; + + if (Boolean.getBoolean("maven.direct")) { + //TODO don't assume we know the path to mvn.. + DefaultArtifactVersion dav = new DefaultArtifactVersion(MavenSettings.getCommandLineMavenVersion()); + constructeur = new DirectConstructor(dav, javaHome, mavenHome); + } else { + constructeur = new ShellConstructor(mavenHome); + } + + List cmdLine = createMavenExecutionCommand(clonedConfig, constructeur); + + ProcessBuilder builder = new ProcessBuilder(cmdLine); + builder.redirectErrorStream(true); + builder.directory(clonedConfig.getExecutionDirectory()); + ioput.getOut().println("NetBeans: Executing '" + StringUtils.join(builder.command().iterator(), " ") + "'"); //NOI18N - to be shown in log. + for (Map.Entry entry : envMap.entrySet()) { + String env = entry.getKey(); + String val = entry.getValue(); + // TODO: do we really put *all* the env vars there? maybe filter, M2_HOME and JDK_HOME? + builder.environment().put(env, val); + ioput.getOut().println("NetBeans: " + env + "=" + val); + } + return builder; } diff --git a/maven/src/org/netbeans/modules/maven/execute/cmd/Constructor.java b/maven/src/org/netbeans/modules/maven/execute/cmd/Constructor.java new file mode 100644 --- /dev/null +++ b/maven/src/org/netbeans/modules/maven/execute/cmd/Constructor.java @@ -0,0 +1,50 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.maven.execute.cmd; + +import java.util.List; + +/** + * + * @author mkleint + */ +public interface Constructor { + List construct(); +} diff --git a/maven/src/org/netbeans/modules/maven/execute/cmd/DirectConstructor.java b/maven/src/org/netbeans/modules/maven/execute/cmd/DirectConstructor.java new file mode 100644 --- /dev/null +++ b/maven/src/org/netbeans/modules/maven/execute/cmd/DirectConstructor.java @@ -0,0 +1,141 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.maven.execute.cmd; + +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import org.apache.maven.artifact.versioning.ArtifactVersion; +import org.apache.maven.artifact.versioning.DefaultArtifactVersion; +import org.openide.util.Utilities; + +/** + * + * @author mkleint + */ +public class DirectConstructor implements Constructor { + private final ArtifactVersion version; + private final File javaExec; + private final File mavenHome; + //#164234 + //if maven.bat file is in space containing path, we need to quote with simple quotes. + String quote = "\""; + // the command line parameters with space in them need to be quoted and escaped to arrive + // correctly to the java runtime on windows + String escaped = "\\" + quote; + + public DirectConstructor(ArtifactVersion version, File javaExec, File mavenHome) { + this.version = version; + this.javaExec = javaExec; + this.mavenHome = mavenHome; + } + + public List construct() { + List toRet = new ArrayList(); + toRet.add(getJavaCmd()); + toRet.addAll(getM2OPTS()); + toRet.addAll(getClassPath()); + toRet.add(getClassWorldsConf()); + toRet.add(getMavenHome()); + toRet.add(getClassWorldLauncher()); + return toRet; + } + + protected String getJavaCmd() { + //TODO we should better pass the java eec directly from the j2seplatform.. + File bin = new File(javaExec, "bin"); + File java = new File(bin, "java"); + return quoteSpaces(java.getAbsolutePath(), quote); + } + + protected List getM2OPTS() { + //TODO - will need to split the content and quote it properly? + return Collections.emptyList(); + } + + protected List getClassPath() { + // in 2.0.5 it's core/boot.. do we care? + File bootParent = new File(mavenHome, "boot"); + File[] boots = bootParent.listFiles(); + List toRet = new ArrayList(); + toRet.add("-classpath"); + if (boots != null && boots.length > 0) { + StringBuffer path = new StringBuffer(); + for (File boot : boots) { + path.append(boot.getAbsolutePath()).append(":"); + } + path.setLength(path.length() - 1); + toRet.add(path.toString()); + return toRet; + } + throw new IllegalArgumentException("Wrong maven.home=" + mavenHome); + } + + protected String getClassWorldsConf() { + //TODO quoting? + return "-Dclassworlds.conf=" + mavenHome.getAbsolutePath() + File.separator + "bin" + File.separator + "m2.conf"; //NOI18N + + } + + protected String getMavenHome() { + return "-Dmaven.home=" + mavenHome.getAbsolutePath(); + } + + protected String getClassWorldLauncher() { + DefaultArtifactVersion dav = new DefaultArtifactVersion("3.0-alpha-2"); //NOI18N + if (version.compareTo(dav) >= 0) { //in 3.0 + return "org.codehaus.plexus.classworlds.launcher.Launcher"; //NOI18N + } + return "org.codehaus.classworlds.Launcher"; //NOI18N + } + + + // we run the shell/bat script in the process, on windows we need to quote any spaces + //once/if we get rid of shell/bat execution, we might need to remove this + //#164234 + private static String quoteSpaces(String val, String quote) { + if (Utilities.isWindows() && val.indexOf(' ') != -1) { //NOI18N + return quote + val + quote; //NOI18N + } + return val; + } + +} diff --git a/maven/src/org/netbeans/modules/maven/execute/cmd/ShellConstructor.java b/maven/src/org/netbeans/modules/maven/execute/cmd/ShellConstructor.java new file mode 100644 --- /dev/null +++ b/maven/src/org/netbeans/modules/maven/execute/cmd/ShellConstructor.java @@ -0,0 +1,98 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.maven.execute.cmd; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import org.openide.util.Utilities; + +/** + * + * @author mkleint + */ +public class ShellConstructor implements Constructor { + private final File mavenHome; + + public ShellConstructor(File mavenHome) { + this.mavenHome = mavenHome; + } + + public List construct() { + //#164234 + //if maven.bat file is in space containing path, we need to quote with simple quotes. + String quote = "\""; + // the command line parameters with space in them need to be quoted and escaped to arrive + // correctly to the java runtime on windows + String escaped = "\\" + quote; + List toRet = new ArrayList(); + String ex = Utilities.isWindows() ? "mvn.bat" : "mvn"; //NOI18N + if (mavenHome != null) { + File bin = new File(mavenHome, "bin" + File.separator + ex);//NOI18N + if (bin.exists()) { + toRet.add(quoteSpaces(bin.getAbsolutePath(), quote)); + } else { + toRet.add(ex); + } + } else { + toRet.add(ex); + } + + if (Utilities.isWindows() && Boolean.getBoolean("maven.run.cmd")) { //#153101 + toRet.add(0, "/c"); //NOI18N + toRet.add(0, "cmd"); //NOI18N + } + return toRet; + } + + // we run the shell/bat script in the process, on windows we need to quote any spaces + //once/if we get rid of shell/bat execution, we might need to remove this + //#164234 + private static String quoteSpaces(String val, String quote) { + if (val.indexOf(' ') != -1) { //NOI18N + if (Utilities.isWindows()) { + return quote + val + quote; //NOI18N + } + } + return val; + } + + +} # HG changeset patch # User Milos Kleint # Date 1244033787 -7200 # Node ID 8153546584fb4a9172604b05aee397e9d8fb45d6 # Parent 9e5dd1a3fa552885e75fc990f00e7519af4565b6 #166011 cater for the invalid fileobject usecase and silently ignore it.. diff --git a/maven.hints/src/org/netbeans/modules/maven/hints/pom/StatusProvider.java b/maven.hints/src/org/netbeans/modules/maven/hints/pom/StatusProvider.java --- a/maven.hints/src/org/netbeans/modules/maven/hints/pom/StatusProvider.java +++ b/maven.hints/src/org/netbeans/modules/maven/hints/pom/StatusProvider.java @@ -218,17 +218,20 @@ FileObject fo = NbEditorUtilities.getFileObject(document); boolean ok = false; try { - DataObject dobj = DataObject.find(fo); - EditorCookie ed = dobj.getCookie(EditorCookie.class); - if (ed != null) { - JEditorPane[] panes = ed.getOpenedPanes(); - if (panes != null && panes.length > 0 && panes[0].getSelectionStart() != panes[0].getSelectionEnd()) { - HintsController.setErrors(document, LAYER_POM_SELECTION, findHints(model, project, panes[0].getSelectionStart(), panes[0].getSelectionEnd())); - ok = true; + if (fo.isValid()) { + DataObject dobj = DataObject.find(fo); + EditorCookie ed = dobj.getCookie(EditorCookie.class); + if (ed != null) { + JEditorPane[] panes = ed.getOpenedPanes(); + if (panes != null && panes.length > 0 && panes[0].getSelectionStart() != panes[0].getSelectionEnd()) { + HintsController.setErrors(document, LAYER_POM_SELECTION, findHints(model, project, panes[0].getSelectionStart(), panes[0].getSelectionEnd())); + ok = true; + } } } } catch (DataObjectNotFoundException ex) { - Exceptions.printStackTrace(ex); + //#166011 just a minor issue, just log, but don't show to user directly + Logger.getLogger(StatusProvider.class.getName()).log(Level.INFO, "Touched somehow invalidated FileObject", ex); } finally { if (!ok) { HintsController.setErrors(document, LAYER_POM_SELECTION, Collections.emptyList()); # HG changeset patch # User Milos Kleint # Date 1244037160 -7200 # Node ID 602e8bb6473fa125aa12159c74b596a1c03d58c4 # Parent c0636ab261dc13fc14c07cc5ef80d9c51e73158b # Parent 8153546584fb4a9172604b05aee397e9d8fb45d6 Automated merge with file:///home/mkleint/src/hg-incoming/main diff --git a/maven.embedder/external/binaries-list b/maven.embedder/external/binaries-list --- a/maven.embedder/external/binaries-list +++ b/maven.embedder/external/binaries-list @@ -1,3 +1,3 @@ -51FB6C9E571AD75CD870E05A41557F9208243C08 maven-embedder-2.1-20080623-patched.jar +DEC63D07DDDC152C588C2CFB7950D947FDAA0C73 maven-embedder-2.1-20080623-patched.jar A2AC1CD690AB4C80DEFE7F9BCE14D35934C35CEC jdom-1.0.jar 653A6AD1EF786BC577FC20F56E5F2B1D30423805 maven-dependency-tree-1.2.jar diff --git a/maven.embedder/nbproject/project.xml b/maven.embedder/nbproject/project.xml --- a/maven.embedder/nbproject/project.xml +++ b/maven.embedder/nbproject/project.xml @@ -40,7 +40,6 @@ Version 2 license, then the option applies only if the new code is made subject to such option by the copyright holder. --> - org.netbeans.modules.apisupport.project @@ -57,6 +56,15 @@ + org.netbeans.libs.commons_logging + + + + 1 + 1.8 + + + org.openide.dialogs diff --git a/maven.hints/src/org/netbeans/modules/maven/hints/pom/StatusProvider.java b/maven.hints/src/org/netbeans/modules/maven/hints/pom/StatusProvider.java --- a/maven.hints/src/org/netbeans/modules/maven/hints/pom/StatusProvider.java +++ b/maven.hints/src/org/netbeans/modules/maven/hints/pom/StatusProvider.java @@ -218,17 +218,20 @@ FileObject fo = NbEditorUtilities.getFileObject(document); boolean ok = false; try { - DataObject dobj = DataObject.find(fo); - EditorCookie ed = dobj.getCookie(EditorCookie.class); - if (ed != null) { - JEditorPane[] panes = ed.getOpenedPanes(); - if (panes != null && panes.length > 0 && panes[0].getSelectionStart() != panes[0].getSelectionEnd()) { - HintsController.setErrors(document, LAYER_POM_SELECTION, findHints(model, project, panes[0].getSelectionStart(), panes[0].getSelectionEnd())); - ok = true; + if (fo.isValid()) { + DataObject dobj = DataObject.find(fo); + EditorCookie ed = dobj.getCookie(EditorCookie.class); + if (ed != null) { + JEditorPane[] panes = ed.getOpenedPanes(); + if (panes != null && panes.length > 0 && panes[0].getSelectionStart() != panes[0].getSelectionEnd()) { + HintsController.setErrors(document, LAYER_POM_SELECTION, findHints(model, project, panes[0].getSelectionStart(), panes[0].getSelectionEnd())); + ok = true; + } } } } catch (DataObjectNotFoundException ex) { - Exceptions.printStackTrace(ex); + //#166011 just a minor issue, just log, but don't show to user directly + Logger.getLogger(StatusProvider.class.getName()).log(Level.INFO, "Touched somehow invalidated FileObject", ex); } finally { if (!ok) { HintsController.setErrors(document, LAYER_POM_SELECTION, Collections.emptyList()); diff --git a/maven/src/org/netbeans/modules/maven/actions/Bundle.properties b/maven/src/org/netbeans/modules/maven/actions/Bundle.properties --- a/maven/src/org/netbeans/modules/maven/actions/Bundle.properties +++ b/maven/src/org/netbeans/modules/maven/actions/Bundle.properties @@ -49,3 +49,5 @@ MSG_Downloading=Downloading {0} MSG_Downloading_javadoc=Downloading javadoc {0} MSG_Downloading_sources=Downloading sources {0} +ERR_NameExists=Library with given name already exists. +ERR_EmptyName=Library Name cannot be empty. diff --git a/maven/src/org/netbeans/modules/maven/actions/CreateLibraryAction.java b/maven/src/org/netbeans/modules/maven/actions/CreateLibraryAction.java --- a/maven/src/org/netbeans/modules/maven/actions/CreateLibraryAction.java +++ b/maven/src/org/netbeans/modules/maven/actions/CreateLibraryAction.java @@ -109,7 +109,8 @@ final MavenProject project = lookup.lookup(MavenProject.class); final CreateLibraryPanel pnl = new CreateLibraryPanel(root); DialogDescriptor dd = new DialogDescriptor(pnl, NbBundle.getMessage(CreateLibraryPanel.class, "LBL_CreateLibrary")); - pnl.setLineSupport(dd.createNotificationLineSupport()); + pnl.setLineSupport(dd.createNotificationLineSupport(), dd); + if (DialogDisplayer.getDefault().notify(dd) == DialogDescriptor.OK_OPTION) { RequestProcessor.getDefault().post(new Runnable() { public void run() { diff --git a/maven/src/org/netbeans/modules/maven/actions/CreateLibraryPanel.java b/maven/src/org/netbeans/modules/maven/actions/CreateLibraryPanel.java --- a/maven/src/org/netbeans/modules/maven/actions/CreateLibraryPanel.java +++ b/maven/src/org/netbeans/modules/maven/actions/CreateLibraryPanel.java @@ -43,7 +43,6 @@ import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.io.File; import java.util.ArrayList; import java.util.Comparator; import java.util.List; @@ -64,8 +63,10 @@ import org.netbeans.modules.maven.dependencies.CheckNode; import org.netbeans.modules.maven.dependencies.CheckNodeListener; import org.netbeans.modules.maven.dependencies.CheckRenderer; +import org.openide.DialogDescriptor; import org.openide.NotificationLineSupport; import org.openide.util.ImageUtilities; +import org.openide.util.NbBundle; /** * @@ -74,6 +75,7 @@ public class CreateLibraryPanel extends javax.swing.JPanel { private DependencyNode rootnode; private NotificationLineSupport line; + private DialogDescriptor dd; /** Creates new form CreateLibraryPanel */ CreateLibraryPanel(DependencyNode root) { @@ -121,8 +123,9 @@ }); } - void setLineSupport(NotificationLineSupport notificationLineSupport) { + void setLineSupport(NotificationLineSupport notificationLineSupport, DialogDescriptor dd) { line = notificationLineSupport; + this.dd = dd; } @@ -135,7 +138,7 @@ private void setLibraryName() { LibraryManager manager = (LibraryManager) comManager.getSelectedItem(); - String currentName = txtName.getText(); + String currentName = getLibraryName(); int index = 0; while (currentName.trim().length() == 0 || manager.getLibrary(currentName.trim()) != null) { currentName = rootnode.getArtifact().getArtifactId(); @@ -144,7 +147,7 @@ } index++; } - if (!currentName.equals(txtName.getText())) { + if (!currentName.equals(getLibraryName())) { txtName.setText(currentName); } } @@ -152,11 +155,17 @@ private void checkLibraryName() { LibraryManager manager = (LibraryManager) comManager.getSelectedItem(); - String currentName = txtName.getText(); - if (manager.getLibrary(currentName) != null) { - line.setErrorMessage("Library with given name already exists."); + String currentName = getLibraryName(); + if (currentName.length() == 0) { + line.setErrorMessage(NbBundle.getMessage(CreateLibraryPanel.class, "ERR_EmptyName")); + dd.setValid(false); + } + else if (manager.getLibrary(currentName) != null) { + line.setErrorMessage(NbBundle.getMessage(CreateLibraryPanel.class, "ERR_NameExists")); + dd.setValid(false); } else { line.clearMessages(); + dd.setValid(true); } } /** This method is called from within the constructor to @@ -257,7 +266,11 @@ } String getLibraryName() { - return txtName.getText(); + String name = txtName.getText().trim(); +// if (name.length() == 0) { +// name = "library"; //NOI18N +// } + return name; } boolean isAllSourceAndJavadoc() { @@ -268,7 +281,7 @@ if (!cbCopy.isSelected()) { return null; } - String dir = txtName.getText().trim(); + String dir = getLibraryName(); return dir; } @@ -302,6 +315,7 @@ return 0; } + private static class Comp implements Comparator { public int compare(Artifact a1, Artifact a2) { @@ -335,8 +349,8 @@ private DefaultMutableTreeNode rootNode; private DependencyNode root; private Stack path; - private Icon icn = ImageUtilities.image2Icon(ImageUtilities.loadImage("org/netbeans/modules/maven/TransitiveDependencyIcon.png", true)); - private Icon icn2 = ImageUtilities.image2Icon(ImageUtilities.loadImage("org/netbeans/modules/maven/DependencyIcon.png", true)); + private Icon icn = ImageUtilities.image2Icon(ImageUtilities.loadImage("org/netbeans/modules/maven/TransitiveDependencyIcon.png", true)); //NOI18N + private Icon icn2 = ImageUtilities.image2Icon(ImageUtilities.loadImage("org/netbeans/modules/maven/DependencyIcon.png", true)); //NOI18N Visitor(DefaultMutableTreeNode root) { this.rootNode = root; diff --git a/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java b/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java --- a/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java +++ b/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java @@ -52,6 +52,9 @@ import hidden.org.codehaus.plexus.util.cli.CommandLineUtils; import java.net.URL; import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.netbeans.api.progress.ProgressHandle; import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.maven.api.execute.ActiveJ2SEPlatformProvider; @@ -59,6 +62,9 @@ import org.netbeans.modules.maven.api.execute.ExecutionResultChecker; import org.netbeans.modules.maven.api.execute.LateBoundPrerequisitesChecker; import org.netbeans.modules.maven.api.execute.RunUtils; +import org.netbeans.modules.maven.execute.cmd.Constructor; +import org.netbeans.modules.maven.execute.cmd.DirectConstructor; +import org.netbeans.modules.maven.execute.cmd.ShellConstructor; import org.netbeans.spi.project.ui.support.BuildExecutionSupport; import org.openide.awt.HtmlBrowser; import org.openide.filesystems.FileObject; @@ -210,17 +216,6 @@ } } - // we run the shell/bat script in the process, on windows we need to quote any spaces - //once/if we get rid of shell/bat execution, we might need to remove this - //#164234 - private static String quoteSpaces(String val, String quote) { - if (val.indexOf(' ') != -1) { //NOI18N - if (Utilities.isWindows()) { - return quote + val + quote; //NOI18N - } - } - return val; - } public boolean cancel() { @@ -235,8 +230,7 @@ return true; } - private static List createMavenExecutionCommand(RunConfig config) { - File mavenHome = MavenSettings.getDefault().getCommandLinePath(); + private static List createMavenExecutionCommand(RunConfig config, Constructor base) { //#164234 //if maven.bat file is in space containing path, we need to quote with simple quotes. String quote = "\""; @@ -244,22 +238,7 @@ // correctly to the java runtime on windows String escaped = "\\" + quote; List toRet = new ArrayList(); - String ex = Utilities.isWindows() ? "mvn.bat" : "mvn"; //NOI18N - if (mavenHome != null) { - File bin = new File(mavenHome, "bin" + File.separator + ex);//NOI18N - if (bin.exists()) { - toRet.add(quoteSpaces(bin.getAbsolutePath(), quote)); - } else { - toRet.add(ex); - } - } else { - toRet.add(ex); - } - - if (Utilities.isWindows() && Boolean.getBoolean("maven.run.cmd")) { //#153101 - toRet.add(0, "/c"); //NOI18N - toRet.add(0, "cmd"); //NOI18N - } + toRet.addAll(base.construct()); for (Object key : config.getProperties().keySet()) { String val = config.getProperties().getProperty((String)key); @@ -351,25 +330,20 @@ } private ProcessBuilder constructBuilder(final RunConfig clonedConfig, InputOutput ioput) { - List cmdLine = createMavenExecutionCommand(clonedConfig); - ProcessBuilder builder = new ProcessBuilder(cmdLine); - builder.redirectErrorStream(true); - builder.directory(clonedConfig.getExecutionDirectory()); - ioput.getOut().println("NetBeans: Executing '" + StringUtils.join(builder.command().iterator(), " ") + "'"); //NOI18N - to be shown in log. - boolean hasJavaSet = false; + File javaHome = null; + Map envMap = new HashMap(); for (Object key : clonedConfig.getProperties().keySet()) { String keyStr = (String) key; if (keyStr.startsWith(ENV_PREFIX)) { String env = keyStr.substring(ENV_PREFIX.length()); String val = clonedConfig.getProperties().getProperty(keyStr); - builder.environment().put(env, val); - ioput.getOut().println("NetBeans: " + env + "=" + val); + envMap.put(env, val); if (keyStr.equals(ENV_JAVAHOME)) { - hasJavaSet = true; + javaHome = new File(val); } } } - if (!hasJavaSet) { + if (javaHome == null) { if (clonedConfig.getProject() != null) { //TODO somehow use the config.getMavenProject() call rather than looking up the // ActiveJ2SEPlatformProvider from lookup. The loaded project can be different from the executed one. @@ -381,23 +355,53 @@ for (FileObject fo : objs) { if (FileUtil.isParentOf(fo, java)) { path = FileUtil.toFile(fo); + if (path != null) { + javaHome = path; + envMap.put(ENV_JAVAHOME.substring(ENV_PREFIX.length()), path.getAbsolutePath()); + } break; } } } - if (path != null) { - builder.environment().put(ENV_JAVAHOME.substring(ENV_PREFIX.length()), path.getAbsolutePath()); - ioput.getOut().println("NetBeans: JAVA_HOME =" + path.getAbsolutePath()); - hasJavaSet = true; + } + //#151559 + if (javaHome == null) { + if (System.getenv("JAVA_HOME") == null) { + //NOI18N + javaHome = new File(System.getProperty("java.home")); + envMap.put("JAVA_HOME", javaHome.getAbsolutePath()); //NOI18N + } else { + javaHome = new File(System.getenv("JAVA_HOME")); + envMap.put("JAVA_HOME", javaHome.getAbsolutePath()); //NOI18N } } - //#151559 - if (!hasJavaSet && System.getenv("JAVA_HOME") == null) { - //NOI18N - builder.environment().put("JAVA_HOME", System.getProperty("java.home")); //NOI18N - ioput.getOut().println("NetBeans: JAVA_HOME =" + System.getProperty("java.home")); - } } + + File mavenHome = MavenSettings.getDefault().getCommandLinePath(); + Constructor constructeur; + + if (Boolean.getBoolean("maven.direct")) { + //TODO don't assume we know the path to mvn.. + DefaultArtifactVersion dav = new DefaultArtifactVersion(MavenSettings.getCommandLineMavenVersion()); + constructeur = new DirectConstructor(dav, javaHome, mavenHome); + } else { + constructeur = new ShellConstructor(mavenHome); + } + + List cmdLine = createMavenExecutionCommand(clonedConfig, constructeur); + + ProcessBuilder builder = new ProcessBuilder(cmdLine); + builder.redirectErrorStream(true); + builder.directory(clonedConfig.getExecutionDirectory()); + ioput.getOut().println("NetBeans: Executing '" + StringUtils.join(builder.command().iterator(), " ") + "'"); //NOI18N - to be shown in log. + for (Map.Entry entry : envMap.entrySet()) { + String env = entry.getKey(); + String val = entry.getValue(); + // TODO: do we really put *all* the env vars there? maybe filter, M2_HOME and JDK_HOME? + builder.environment().put(env, val); + ioput.getOut().println("NetBeans: " + env + "=" + val); + } + return builder; } diff --git a/maven/src/org/netbeans/modules/maven/execute/cmd/Constructor.java b/maven/src/org/netbeans/modules/maven/execute/cmd/Constructor.java new file mode 100644 --- /dev/null +++ b/maven/src/org/netbeans/modules/maven/execute/cmd/Constructor.java @@ -0,0 +1,50 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.maven.execute.cmd; + +import java.util.List; + +/** + * + * @author mkleint + */ +public interface Constructor { + List construct(); +} diff --git a/maven/src/org/netbeans/modules/maven/execute/cmd/DirectConstructor.java b/maven/src/org/netbeans/modules/maven/execute/cmd/DirectConstructor.java new file mode 100644 --- /dev/null +++ b/maven/src/org/netbeans/modules/maven/execute/cmd/DirectConstructor.java @@ -0,0 +1,141 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.maven.execute.cmd; + +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import org.apache.maven.artifact.versioning.ArtifactVersion; +import org.apache.maven.artifact.versioning.DefaultArtifactVersion; +import org.openide.util.Utilities; + +/** + * + * @author mkleint + */ +public class DirectConstructor implements Constructor { + private final ArtifactVersion version; + private final File javaExec; + private final File mavenHome; + //#164234 + //if maven.bat file is in space containing path, we need to quote with simple quotes. + String quote = "\""; + // the command line parameters with space in them need to be quoted and escaped to arrive + // correctly to the java runtime on windows + String escaped = "\\" + quote; + + public DirectConstructor(ArtifactVersion version, File javaExec, File mavenHome) { + this.version = version; + this.javaExec = javaExec; + this.mavenHome = mavenHome; + } + + public List construct() { + List toRet = new ArrayList(); + toRet.add(getJavaCmd()); + toRet.addAll(getM2OPTS()); + toRet.addAll(getClassPath()); + toRet.add(getClassWorldsConf()); + toRet.add(getMavenHome()); + toRet.add(getClassWorldLauncher()); + return toRet; + } + + protected String getJavaCmd() { + //TODO we should better pass the java eec directly from the j2seplatform.. + File bin = new File(javaExec, "bin"); + File java = new File(bin, "java"); + return quoteSpaces(java.getAbsolutePath(), quote); + } + + protected List getM2OPTS() { + //TODO - will need to split the content and quote it properly? + return Collections.emptyList(); + } + + protected List getClassPath() { + // in 2.0.5 it's core/boot.. do we care? + File bootParent = new File(mavenHome, "boot"); + File[] boots = bootParent.listFiles(); + List toRet = new ArrayList(); + toRet.add("-classpath"); + if (boots != null && boots.length > 0) { + StringBuffer path = new StringBuffer(); + for (File boot : boots) { + path.append(boot.getAbsolutePath()).append(":"); + } + path.setLength(path.length() - 1); + toRet.add(path.toString()); + return toRet; + } + throw new IllegalArgumentException("Wrong maven.home=" + mavenHome); + } + + protected String getClassWorldsConf() { + //TODO quoting? + return "-Dclassworlds.conf=" + mavenHome.getAbsolutePath() + File.separator + "bin" + File.separator + "m2.conf"; //NOI18N + + } + + protected String getMavenHome() { + return "-Dmaven.home=" + mavenHome.getAbsolutePath(); + } + + protected String getClassWorldLauncher() { + DefaultArtifactVersion dav = new DefaultArtifactVersion("3.0-alpha-2"); //NOI18N + if (version.compareTo(dav) >= 0) { //in 3.0 + return "org.codehaus.plexus.classworlds.launcher.Launcher"; //NOI18N + } + return "org.codehaus.classworlds.Launcher"; //NOI18N + } + + + // we run the shell/bat script in the process, on windows we need to quote any spaces + //once/if we get rid of shell/bat execution, we might need to remove this + //#164234 + private static String quoteSpaces(String val, String quote) { + if (Utilities.isWindows() && val.indexOf(' ') != -1) { //NOI18N + return quote + val + quote; //NOI18N + } + return val; + } + +} diff --git a/maven/src/org/netbeans/modules/maven/execute/cmd/ShellConstructor.java b/maven/src/org/netbeans/modules/maven/execute/cmd/ShellConstructor.java new file mode 100644 --- /dev/null +++ b/maven/src/org/netbeans/modules/maven/execute/cmd/ShellConstructor.java @@ -0,0 +1,98 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.maven.execute.cmd; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import org.openide.util.Utilities; + +/** + * + * @author mkleint + */ +public class ShellConstructor implements Constructor { + private final File mavenHome; + + public ShellConstructor(File mavenHome) { + this.mavenHome = mavenHome; + } + + public List construct() { + //#164234 + //if maven.bat file is in space containing path, we need to quote with simple quotes. + String quote = "\""; + // the command line parameters with space in them need to be quoted and escaped to arrive + // correctly to the java runtime on windows + String escaped = "\\" + quote; + List toRet = new ArrayList(); + String ex = Utilities.isWindows() ? "mvn.bat" : "mvn"; //NOI18N + if (mavenHome != null) { + File bin = new File(mavenHome, "bin" + File.separator + ex);//NOI18N + if (bin.exists()) { + toRet.add(quoteSpaces(bin.getAbsolutePath(), quote)); + } else { + toRet.add(ex); + } + } else { + toRet.add(ex); + } + + if (Utilities.isWindows() && Boolean.getBoolean("maven.run.cmd")) { //#153101 + toRet.add(0, "/c"); //NOI18N + toRet.add(0, "cmd"); //NOI18N + } + return toRet; + } + + // we run the shell/bat script in the process, on windows we need to quote any spaces + //once/if we get rid of shell/bat execution, we might need to remove this + //#164234 + private static String quoteSpaces(String val, String quote) { + if (val.indexOf(' ') != -1) { //NOI18N + if (Utilities.isWindows()) { + return quote + val + quote; //NOI18N + } + } + return val; + } + + +} # HG changeset patch # User Alexander Simon # Date 1244015564 -14400 # Node ID f6865b1a4c6885fb7530bfda15204c52d7ea9093 # Parent 308f6a2b90f228e9007998383b183bdc34f79e09 undate test source base for unit test diff --git a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java --- a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java +++ b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java @@ -188,19 +188,19 @@ } }; NativeExecutor ne = null; - File file = new File(dataPath + "/pkgconfig-0.18"); + File file = new File(dataPath + "/pkg-config-0.23"); if (!file.exists()){ file.mkdirs(); } if (file.list().length == 0){ ne = new NativeExecutor(dataPath,"wget", - "http://pkgconfig.freedesktop.org/releases/pkgconfig-0.18.tar.gz",new String[0],"wget","run",false,false); + "http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz",new String[0],"wget","run",false,false); waitExecution(ne, listener, finish); ne = new NativeExecutor(dataPath,"gzip", - "-d pkgconfig-0.18.tar.gz",new String[0],"gzip","run",false,false); + "-d pkg-config-0.23.tar.gz",new String[0],"gzip","run",false,false); waitExecution(ne, listener, finish); ne = new NativeExecutor(dataPath,"tar", - "xf pkgconfig-0.18.tar",new String[0],"tar","run",false,false); + "xf pkg-config-0.23.tar",new String[0],"tar","run",false,false); waitExecution(ne, listener, finish); } @@ -219,7 +219,7 @@ "xf litesql-0.3.3.tar",new String[0],"tar","run",false,false); waitExecution(ne, listener, finish); } - list.add(dataPath + "/pkgconfig-0.18"); //NOI18N + list.add(dataPath + "/pkg-config-0.23"); //NOI18N list.add(dataPath + "/litesql-0.3.3"); //NOI18N for(String f : list){ file = new File(f); @@ -227,7 +227,7 @@ } list = expandAndSort(list); list.add("-DHAVE_CONFIG_H"); - list.add("-I"+dataPath + "/pkgconfig-0.18"); + list.add("-I"+dataPath + "/pkg-config-0.23"); list.add("-I"+dataPath + "/litesql-0.3.3"); return list; } # HG changeset patch # User ffjre@netbeans.org # Date 1244016868 -7200 # Node ID 6ddbdc8a0ad4cbe414002ccf88980fc1f7f06460 # Parent 1e79acf59bd76887f1c7ac4798cd7e173d062816 # Parent f6865b1a4c6885fb7530bfda15204c52d7ea9093 Automated merge diff --git a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java --- a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java +++ b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java @@ -188,19 +188,19 @@ } }; NativeExecutor ne = null; - File file = new File(dataPath + "/pkgconfig-0.18"); + File file = new File(dataPath + "/pkg-config-0.23"); if (!file.exists()){ file.mkdirs(); } if (file.list().length == 0){ ne = new NativeExecutor(dataPath,"wget", - "http://pkgconfig.freedesktop.org/releases/pkgconfig-0.18.tar.gz",new String[0],"wget","run",false,false); + "http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz",new String[0],"wget","run",false,false); waitExecution(ne, listener, finish); ne = new NativeExecutor(dataPath,"gzip", - "-d pkgconfig-0.18.tar.gz",new String[0],"gzip","run",false,false); + "-d pkg-config-0.23.tar.gz",new String[0],"gzip","run",false,false); waitExecution(ne, listener, finish); ne = new NativeExecutor(dataPath,"tar", - "xf pkgconfig-0.18.tar",new String[0],"tar","run",false,false); + "xf pkg-config-0.23.tar",new String[0],"tar","run",false,false); waitExecution(ne, listener, finish); } @@ -219,7 +219,7 @@ "xf litesql-0.3.3.tar",new String[0],"tar","run",false,false); waitExecution(ne, listener, finish); } - list.add(dataPath + "/pkgconfig-0.18"); //NOI18N + list.add(dataPath + "/pkg-config-0.23"); //NOI18N list.add(dataPath + "/litesql-0.3.3"); //NOI18N for(String f : list){ file = new File(f); @@ -227,7 +227,7 @@ } list = expandAndSort(list); list.add("-DHAVE_CONFIG_H"); - list.add("-I"+dataPath + "/pkgconfig-0.18"); + list.add("-I"+dataPath + "/pkg-config-0.23"); list.add("-I"+dataPath + "/litesql-0.3.3"); return list; } # HG changeset patch # User Vladimir Voskresensky # Date 1244019459 -14400 # Node ID 0a7374ce03bdb75bdce733ed26966af192f1711f # Parent 8320866e16e99ee4addd0b8bf2c9b3b07149abc9 in concurrent mode both maps should be concurrent diff --git a/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java b/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java --- a/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java +++ b/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java @@ -78,7 +78,7 @@ } private static APTFileCacheEntry create(CharSequence filePath, boolean serial) { - return new APTFileCacheEntry(filePath, serial, serial ? new HashMap() : new ConcurrentHashMap(), new HashMap()); + return new APTFileCacheEntry(filePath, serial, serial ? new HashMap() : new ConcurrentHashMap(), serial ? new HashMap() : new ConcurrentHashMap()); } public boolean isSerial() { # HG changeset patch # User Vladimir Voskresensky # Date 1244020055 -14400 # Node ID e1af35301ce23f1d0e1292cf7cf4a13ae56ae835 # Parent 0a7374ce03bdb75bdce733ed26966af192f1711f only use cache, not store it from next level includes caused by client diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java @@ -135,11 +135,11 @@ APTFile aptLight = inclFileOwner.getAPTLight(csmFile); if (aptLight != null) { APTPreprocHandler preprocHandler = getPreprocHandler(); - APTFileCacheEntry cacheEntry = csmFile.getAPTCacheEntry(preprocHandler, false); + APTFileCacheEntry cacheEntry = csmFile.getAPTCacheEntry(preprocHandler, true); APTWalker walker = new APTRestorePreprocStateWalker(getStartProject(), aptLight, csmFile, preprocHandler,cacheEntry); walker.visit(); - // remember walk info - csmFile.setAPTCacheEntry(preprocHandler, cacheEntry, false); + // does not remember walk info to safe memory + // csmFile.setAPTCacheEntry(preprocHandler, cacheEntry, false); } else { // expected #included file was deleted csmFile = null; diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java @@ -70,10 +70,10 @@ try { APTFile apt = APTDriver.getInstance().findAPTLight(new FileBufferFile(new File(resolvedPath.getPath().toString()))); APTPreprocHandler preprocHandler = getPreprocHandler(); - APTFileCacheEntry cache = APTFileCacheManager.getEntry(resolvedPath.getPath(),preprocHandler, false); + APTFileCacheEntry cache = APTFileCacheManager.getEntry(resolvedPath.getPath(),preprocHandler, true); createIncludeWalker(apt, this, resolvedPath.getPath(), cache).visit(); - // remember walk - APTFileCacheManager.setAPTCacheEntry(resolvedPath.getPath(), preprocHandler, cache, false); + // does not remember walk to safe memory + // APTFileCacheManager.setAPTCacheEntry(resolvedPath.getPath(), preprocHandler, cache, false); } catch (FileNotFoundException ex) { APTUtils.LOG.log(Level.WARNING, "APTSelfWalker: file {0} not found", new Object[] {resolvedPath.getPath()});// NOI18N DiagnosticExceptoins.register(ex); @@ -95,4 +95,4 @@ protected boolean hasIncludeActionSideEffects() { return false; } -} \ No newline at end of file +} # HG changeset patch # User Vladimir Voskresensky # Date 1244020174 -14400 # Node ID ce14e7ce74435ffd722b20c3220104bf16dc8c47 # Parent e1af35301ce23f1d0e1292cf7cf4a13ae56ae835 new line diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java @@ -96,3 +96,4 @@ return false; } } + # HG changeset patch # User Vladimir Voskresensky # Date 1244020311 -14400 # Node ID 2d3155c1f50544b2c0741f75585d8a6a90b5ff18 # Parent f6865b1a4c6885fb7530bfda15204c52d7ea9093 # Parent ce14e7ce74435ffd722b20c3220104bf16dc8c47 Automated merge with http://hg.netbeans.org/cnd-main diff --git a/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java b/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java --- a/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java +++ b/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java @@ -78,7 +78,7 @@ } private static APTFileCacheEntry create(CharSequence filePath, boolean serial) { - return new APTFileCacheEntry(filePath, serial, serial ? new HashMap() : new ConcurrentHashMap(), new HashMap()); + return new APTFileCacheEntry(filePath, serial, serial ? new HashMap() : new ConcurrentHashMap(), serial ? new HashMap() : new ConcurrentHashMap()); } public boolean isSerial() { diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java @@ -135,11 +135,11 @@ APTFile aptLight = inclFileOwner.getAPTLight(csmFile); if (aptLight != null) { APTPreprocHandler preprocHandler = getPreprocHandler(); - APTFileCacheEntry cacheEntry = csmFile.getAPTCacheEntry(preprocHandler, false); + APTFileCacheEntry cacheEntry = csmFile.getAPTCacheEntry(preprocHandler, true); APTWalker walker = new APTRestorePreprocStateWalker(getStartProject(), aptLight, csmFile, preprocHandler,cacheEntry); walker.visit(); - // remember walk info - csmFile.setAPTCacheEntry(preprocHandler, cacheEntry, false); + // does not remember walk info to safe memory + // csmFile.setAPTCacheEntry(preprocHandler, cacheEntry, false); } else { // expected #included file was deleted csmFile = null; diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java @@ -70,10 +70,10 @@ try { APTFile apt = APTDriver.getInstance().findAPTLight(new FileBufferFile(new File(resolvedPath.getPath().toString()))); APTPreprocHandler preprocHandler = getPreprocHandler(); - APTFileCacheEntry cache = APTFileCacheManager.getEntry(resolvedPath.getPath(),preprocHandler, false); + APTFileCacheEntry cache = APTFileCacheManager.getEntry(resolvedPath.getPath(),preprocHandler, true); createIncludeWalker(apt, this, resolvedPath.getPath(), cache).visit(); - // remember walk - APTFileCacheManager.setAPTCacheEntry(resolvedPath.getPath(), preprocHandler, cache, false); + // does not remember walk to safe memory + // APTFileCacheManager.setAPTCacheEntry(resolvedPath.getPath(), preprocHandler, cache, false); } catch (FileNotFoundException ex) { APTUtils.LOG.log(Level.WARNING, "APTSelfWalker: file {0} not found", new Object[] {resolvedPath.getPath()});// NOI18N DiagnosticExceptoins.register(ex); @@ -95,4 +95,5 @@ protected boolean hasIncludeActionSideEffects() { return false; } -} \ No newline at end of file +} + # HG changeset patch # User ffjre@netbeans.org # Date 1244026769 -7200 # Node ID aef395da7c560ab4316951317883f4e8e080f036 # Parent 6ddbdc8a0ad4cbe414002ccf88980fc1f7f06460 # Parent 2d3155c1f50544b2c0741f75585d8a6a90b5ff18 Automated merge diff --git a/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java b/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java --- a/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java +++ b/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java @@ -78,7 +78,7 @@ } private static APTFileCacheEntry create(CharSequence filePath, boolean serial) { - return new APTFileCacheEntry(filePath, serial, serial ? new HashMap() : new ConcurrentHashMap(), new HashMap()); + return new APTFileCacheEntry(filePath, serial, serial ? new HashMap() : new ConcurrentHashMap(), serial ? new HashMap() : new ConcurrentHashMap()); } public boolean isSerial() { diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java @@ -135,11 +135,11 @@ APTFile aptLight = inclFileOwner.getAPTLight(csmFile); if (aptLight != null) { APTPreprocHandler preprocHandler = getPreprocHandler(); - APTFileCacheEntry cacheEntry = csmFile.getAPTCacheEntry(preprocHandler, false); + APTFileCacheEntry cacheEntry = csmFile.getAPTCacheEntry(preprocHandler, true); APTWalker walker = new APTRestorePreprocStateWalker(getStartProject(), aptLight, csmFile, preprocHandler,cacheEntry); walker.visit(); - // remember walk info - csmFile.setAPTCacheEntry(preprocHandler, cacheEntry, false); + // does not remember walk info to safe memory + // csmFile.setAPTCacheEntry(preprocHandler, cacheEntry, false); } else { // expected #included file was deleted csmFile = null; diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java @@ -70,10 +70,10 @@ try { APTFile apt = APTDriver.getInstance().findAPTLight(new FileBufferFile(new File(resolvedPath.getPath().toString()))); APTPreprocHandler preprocHandler = getPreprocHandler(); - APTFileCacheEntry cache = APTFileCacheManager.getEntry(resolvedPath.getPath(),preprocHandler, false); + APTFileCacheEntry cache = APTFileCacheManager.getEntry(resolvedPath.getPath(),preprocHandler, true); createIncludeWalker(apt, this, resolvedPath.getPath(), cache).visit(); - // remember walk - APTFileCacheManager.setAPTCacheEntry(resolvedPath.getPath(), preprocHandler, cache, false); + // does not remember walk to safe memory + // APTFileCacheManager.setAPTCacheEntry(resolvedPath.getPath(), preprocHandler, cache, false); } catch (FileNotFoundException ex) { APTUtils.LOG.log(Level.WARNING, "APTSelfWalker: file {0} not found", new Object[] {resolvedPath.getPath()});// NOI18N DiagnosticExceptoins.register(ex); @@ -95,4 +95,5 @@ protected boolean hasIncludeActionSideEffects() { return false; } -} \ No newline at end of file +} + # HG changeset patch # User ffjre@netbeans.org # Date 1243976870 -14400 # Node ID 12a70ef2b544b87f4f3abc51baf68e4a511a0283 # Parent 5b898a28e0ad491677f28415e0814b934e86d26a # Parent d9ea8b21141ec11056740664ec6b41a0221a589b Automated merge with http://hg.netbeans.org/web-main diff --git a/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTDefineNode.java b/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTDefineNode.java --- a/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTDefineNode.java +++ b/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTDefineNode.java @@ -275,10 +275,10 @@ return false; } final APTDefineNode other = (APTDefineNode) obj; - if (this.params != other.params && (this.params == null || !this.params.equals(other.params))) { + if (!APTUtils.equalArrayLists(this.params, other.params)) { return false; } - if (this.bodyTokens != other.bodyTokens && (this.bodyTokens == null || !this.bodyTokens.equals(other.bodyTokens))) { + if (!APTUtils.equalArrayLists(this.bodyTokens, other.bodyTokens)) { return false; } return true; diff --git a/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTUtils.java b/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTUtils.java --- a/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTUtils.java +++ b/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTUtils.java @@ -108,6 +108,28 @@ return h ^ (h >>> 16); } + public static boolean equalArrayLists(List l1, List l2) { + if (l1 != l2) { + if (l1 == null || l2 == null) { + return false; + } else { + int n1 = l1.size(); + int n2 = l2.size(); + if (n1 != n2) { + return false; + } + for (int i = 0; i < n1; i++) { + if (!l1.get(i).equals(l2.get(i))) { + return false; + } + } + return true; + } + } else { + return true; + } + } + public static void setTokenText(APTToken _token, char buf[], int start, int count) { if (_token instanceof APTBaseToken) { _token.setTextID(CharSequenceKey.create(buf, start, count)); diff --git a/cnd.gizmo/src/org/netbeans/modules/cnd/gizmo/CodeModelSourceFileInfoProvider.java b/cnd.gizmo/src/org/netbeans/modules/cnd/gizmo/CodeModelSourceFileInfoProvider.java --- a/cnd.gizmo/src/org/netbeans/modules/cnd/gizmo/CodeModelSourceFileInfoProvider.java +++ b/cnd.gizmo/src/org/netbeans/modules/cnd/gizmo/CodeModelSourceFileInfoProvider.java @@ -61,7 +61,7 @@ @ServiceProvider(service = SourceFileInfoProvider.class) public final class CodeModelSourceFileInfoProvider implements SourceFileInfoProvider { - public SourceFileInfo fileName(String functionName, long offset, Map serviceInfo) { + public SourceFileInfo fileName(String functionName, int lineNumber, long offset, Map serviceInfo) { try { //get project current name String projectFolderName = serviceInfo.get(GizmoServiceInfo.GIZMO_PROJECT_FOLDER); @@ -83,6 +83,9 @@ } String sourceFile = function.getContainingFile().getAbsolutePath().toString(); int startOffset = function.getStartOffset(); + if (lineNumber > 0){ + return new SourceFileInfo(sourceFile, lineNumber, 0); + } return new SourceFileInfo(sourceFile, startOffset);//) + offset); // CsmDeclaration csmDeclaration = csmProject.findDeclaration(functionName); // if (csmDeclaration == null) { diff --git a/cnd.gizmo/src/org/netbeans/modules/cnd/gizmo/DwarfSourceInfoProvider.java b/cnd.gizmo/src/org/netbeans/modules/cnd/gizmo/DwarfSourceInfoProvider.java --- a/cnd.gizmo/src/org/netbeans/modules/cnd/gizmo/DwarfSourceInfoProvider.java +++ b/cnd.gizmo/src/org/netbeans/modules/cnd/gizmo/DwarfSourceInfoProvider.java @@ -65,13 +65,13 @@ cache = new WeakHashMap>(); } - public SourceFileInfo fileName(String functionName, long offset, Map serviceInfo) { + public SourceFileInfo fileName(String functionName, int lineNumber, long offset, Map serviceInfo) { if (serviceInfo == null){ return null; } String executable = serviceInfo.get(GizmoServiceInfo.GIZMO_PROJECT_EXECUTABLE); if (executable != null) { - Map sourceInfoMap = getSourceInfo(executable, serviceInfo); + Map sourceInfoMap = getSourceInfo(executable, lineNumber, serviceInfo); SourceFileInfo sourceInfo = sourceInfoMap.get(functionName); if (sourceInfo != null) { return sourceInfo; @@ -97,7 +97,7 @@ return null; } - private synchronized Map getSourceInfo(String executable, Map serviceInfo) { + private synchronized Map getSourceInfo(String executable, int lineNumber, Map serviceInfo) { Map sourceInfoMap = cache.get(executable); if (sourceInfoMap == null) { sourceInfoMap = new HashMap(); @@ -109,7 +109,7 @@ if (entry.getKind().equals(TAG.DW_TAG_subprogram)) { SourceFileInfo sourceInfo = new SourceFileInfo( toAbsolutePath(serviceInfo, entry.getDeclarationFilePath()), - entry.getLine(), 0); + lineNumber > 0 ? lineNumber : entry.getLine(), 0); sourceInfoMap.put(entry.getQualifiedName(), sourceInfo); } } diff --git a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/ProjectActionSupport.java b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/ProjectActionSupport.java --- a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/ProjectActionSupport.java +++ b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/ProjectActionSupport.java @@ -43,6 +43,7 @@ import java.awt.event.ActionEvent; import java.io.File; import java.io.IOException; +import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; import javax.swing.AbstractAction; @@ -360,7 +361,15 @@ } } if (success) { - RemoteSyncWorker syncWorker = ServerList.get(env).getSyncFactory().createNew(new File(baseDir), env, null, null); + PrintWriter err = null; + PrintWriter out = null; + InputOutput tab = getTab(); + if (tab != null) { + out = this.ioTab.getOut(); + err = this.ioTab.getErr(); + } + RemoteSyncWorker syncWorker = ServerList.get(env).getSyncFactory().createNew( + new File(baseDir), env, out, err); success &= syncWorker.synchronize(); } } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/FunctionImplEx.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/FunctionImplEx.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/FunctionImplEx.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/FunctionImplEx.java @@ -209,7 +209,7 @@ FileImpl aFile = (FileImpl) getContainingFile(); VariableDefinitionImpl var = new VariableDefinitionImpl(fixFakeRegistrationAst, getContainingFile(), getReturnType(), getName().toString()); aFile.getProjectImpl(true).unregisterDeclaration(this); - RepositoryUtils.remove(getUID()); + RepositoryUtils.remove(getUID(), this); aFile.getProjectImpl(true).registerDeclaration(var); aFile.addDeclaration(var); fixFakeRegistrationAst = null; @@ -227,7 +227,7 @@ FileImpl aFile = (FileImpl) getContainingFile(); VariableDefinitionImpl var = new VariableDefinitionImpl(fixFakeRegistrationAst, getContainingFile(), getReturnType(), getName().toString()); aFile.getProjectImpl(true).unregisterDeclaration(this); - RepositoryUtils.remove(getUID()); + RepositoryUtils.remove(getUID(), this); aFile.getProjectImpl(true).registerDeclaration(var); aFile.addDeclaration(var); fixFakeRegistrationAst = null; @@ -241,7 +241,7 @@ FunctionImpl fi = new FunctionImpl(fixFakeRegistrationAst, getContainingFile(), this.getScope(), true, true); fixFakeRegistrationAst = null; aFile.getProjectImpl(true).unregisterDeclaration(this); - RepositoryUtils.remove(getUID()); + RepositoryUtils.remove(getUID(), this); aFile.addDeclaration(fi); fixed = true; if (NamespaceImpl.isNamespaceScope(fi)) { diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/NamespaceDefinitionImpl.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/NamespaceDefinitionImpl.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/NamespaceDefinitionImpl.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/NamespaceDefinitionImpl.java @@ -183,7 +183,7 @@ CsmUID uid = UIDCsmConverter.declarationToUID(declaration); assert uid != null; declarations.remove(uid); - RepositoryUtils.remove(uid); + RepositoryUtils.remove(uid, declaration); // update repository RepositoryUtils.put(this); } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/NamespaceImpl.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/NamespaceImpl.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/NamespaceImpl.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/NamespaceImpl.java @@ -455,7 +455,7 @@ getDeclarationsSorage().removeDeclaration(declaration); } // do not clean repository, it must be done from physical container of declaration - if (false) { RepositoryUtils.remove(declarationUid); } + if (false) { RepositoryUtils.remove(declarationUid, declaration); } // update repository RepositoryUtils.put(this); notify(declaration, NotifyEvent.DECLARATION_REMOVED); @@ -532,7 +532,7 @@ nsDefinitionsLock.writeLock().unlock(); } // does not remove unregistered declaration from repository, it's responsibility of physical container - if (false) { RepositoryUtils.remove(definitionUid); } + if (false) { RepositoryUtils.remove(definitionUid, def); } // update repository about itself RepositoryUtils.put(this); if (remove) { diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/FileContainer.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/FileContainer.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/FileContainer.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/FileContainer.java @@ -165,7 +165,7 @@ if (f != null) { if (f.fileNew != null){ // clean repository - if (false) { RepositoryUtils.remove(f.fileNew) ;} + if (false) { RepositoryUtils.remove(f.fileNew, null) ;} } } put(); diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/FileImpl.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/FileImpl.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/FileImpl.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/FileImpl.java @@ -680,6 +680,7 @@ } private void onDispose() { + RepositoryUtils.disposeUID(uid, this); projectLock.writeLock().lock(); try { if (projectRef == null) { @@ -1574,7 +1575,7 @@ } finally { declarationsLock.writeLock().unlock(); } - RepositoryUtils.remove(uidDecl); + RepositoryUtils.remove(uidDecl, declaration); // update repository RepositoryUtils.put(this); } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/LibraryManager.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/LibraryManager.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/LibraryManager.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/LibraryManager.java @@ -82,6 +82,10 @@ private final Map librariesEntries = new ConcurrentHashMap(); private final Object lock = new Object(); + public void shutdown(){ + librariesEntries.clear(); + } + /** * Returns collection of artificial libraries used in project */ diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/ModelImpl.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/ModelImpl.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/ModelImpl.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/ModelImpl.java @@ -443,6 +443,7 @@ for (Iterator projIter = libs.iterator(); projIter.hasNext();) { disposeProject((ProjectBase) projIter.next()); } + LibraryManager.getInstance().shutdown(); cleanCaches(); diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/OffsetableIdentifiableBase.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/OffsetableIdentifiableBase.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/OffsetableIdentifiableBase.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/OffsetableIdentifiableBase.java @@ -47,6 +47,7 @@ import org.netbeans.modules.cnd.api.model.CsmFile; import org.netbeans.modules.cnd.api.model.CsmOffsetable; import org.netbeans.modules.cnd.api.model.CsmUID; +import org.netbeans.modules.cnd.modelimpl.repository.RepositoryUtils; import org.netbeans.modules.cnd.modelimpl.uid.UIDObjectFactory; import org.netbeans.modules.cnd.modelimpl.uid.UIDProviderIml; import org.netbeans.modules.cnd.repository.spi.Persistent; @@ -77,6 +78,12 @@ protected abstract CsmUID createUID(); + @Override + public void dispose() { + RepositoryUtils.disposeUID(uid, this); + super.dispose(); + } + @SuppressWarnings("unchecked") public CsmUID getUID() { if (uid == null) { diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/ProjectBase.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/ProjectBase.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/ProjectBase.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/ProjectBase.java @@ -1962,7 +1962,7 @@ assert key instanceof TinyCharSequence; CsmUID nsUID = namespaces.remove(key); assert nsUID != null; - RepositoryUtils.remove(nsUID); + RepositoryUtils.remove(nsUID, ns); } protected final ModelImpl getModel() { diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/impl/services/FileInfoQueryImpl.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/impl/services/FileInfoQueryImpl.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/impl/services/FileInfoQueryImpl.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/impl/services/FileInfoQueryImpl.java @@ -155,45 +155,6 @@ } else { out = result; } -// try { -// APTFile apt = APTDriver.getInstance().findAPTLight(fileImpl.getBuffer()); -// -// if (hasConditionalsDirectives(apt)) { -// Collection handlers = fileImpl.getPreprocHandlers(); -// if (handlers.isEmpty()) { -// DiagnosticExceptoins.register(new IllegalStateException("Empty preprocessor handlers for " + file.getAbsolutePath())); //NOI18N -// return Collections.emptyList(); -// } else if (handlers.size() == 1) { -// APTPreprocHandler handler = handlers.iterator().next(); -// APTFindUnusedBlocksWalker walker = new APTFindUnusedBlocksWalker(apt, fileImpl, handler, fileImpl.getAPTCacheEntry(handler)); -// walker.visit(); -// out = walker.getBlocks(); -// } else { -// //Comparator comparator = new OffsetableComparator(); -// //TreeSet result = new TreeSet(comparator); -// List result = new ArrayList(); -// first = true; -// for (APTPreprocHandler handler : handlers) { -// APTFindUnusedBlocksWalker walker = new APTFindUnusedBlocksWalker(apt, fileImpl, handler, fileImpl.getAPTCacheEntry(handler)); -// walker.visit(); -// List blocks = walker.getBlocks(); -// if (first) { -// result = blocks; -// first = false; -// } else { -// result = intersection(result, blocks); -// if (result.isEmpty()) { -// break; -// } -// } -// } -// out = result; -// } -// } -// } catch (IOException ex) { -// System.err.println("skip getting unused blocks\nreason:" + ex.getMessage()); //NOI18N -// DiagnosticExceptoins.register(ex); -// } } return out; } @@ -269,18 +230,16 @@ APTPreprocHandler handler = handlers.iterator().next(); APTFileCacheEntry cacheEntry = fileImpl.getAPTCacheEntry(handler, true); APTFindMacrosWalker walker = new APTFindMacrosWalker(apt, fileImpl, handler, cacheEntry); - walker.getTokenStream(); + out = walker.collectMacros(); fileImpl.setAPTCacheEntry(handler, cacheEntry, false); - out = walker.getCollectedData(); } else { Comparator comparator = new OffsetableComparator(); TreeSet result = new TreeSet(comparator); for (APTPreprocHandler handler : handlers) { APTFileCacheEntry cacheEntry = fileImpl.getAPTCacheEntry(handler, true); APTFindMacrosWalker walker = new APTFindMacrosWalker(apt, fileImpl, handler, cacheEntry); - walker.getTokenStream(); + result.addAll(walker.collectMacros()); fileImpl.setAPTCacheEntry(handler, cacheEntry, false); - result.addAll(walker.getCollectedData()); } out = new ArrayList(result); } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTDefinesCollectorWalker.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTDefinesCollectorWalker.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTDefinesCollectorWalker.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTDefinesCollectorWalker.java @@ -76,8 +76,8 @@ } @Override - protected APTWalker createIncludeWalker(APTFile apt, APTSelfWalker parent, CharSequence includePath) { - return new APTDefinesCollectorWalker(apt, parent.csmFile, ((APTDefinesCollectorWalker) parent).getPreprocHandler(), macroRefMap, includePath, null); + protected APTWalker createIncludeWalker(APTFile apt, APTSelfWalker parent, CharSequence includePath, APTFileCacheEntry cache) { + return new APTDefinesCollectorWalker(apt, parent.csmFile, ((APTDefinesCollectorWalker) parent).getPreprocHandler(), macroRefMap, includePath, cache); } @Override diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTFindMacrosWalker.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTFindMacrosWalker.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTFindMacrosWalker.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTFindMacrosWalker.java @@ -43,14 +43,12 @@ import antlr.TokenStream; import antlr.TokenStreamException; -import java.io.File; import java.util.ArrayList; -import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Map; import org.netbeans.modules.cnd.api.model.CsmFile; import org.netbeans.modules.cnd.api.model.CsmMacro; +import org.netbeans.modules.cnd.api.model.CsmModelAccessor; import org.netbeans.modules.cnd.api.model.CsmObject; import org.netbeans.modules.cnd.api.model.services.CsmSelect; import org.netbeans.modules.cnd.api.model.services.CsmSelect.CsmFilter; @@ -77,21 +75,16 @@ import org.netbeans.modules.cnd.modelimpl.csm.core.ProjectBase; import org.netbeans.modules.cnd.modelimpl.csm.core.Unresolved; import org.netbeans.modules.cnd.modelimpl.debug.DiagnosticExceptoins; -import org.netbeans.modules.cnd.modelimpl.textcache.DefaultCache; -import org.netbeans.modules.cnd.modelimpl.uid.UIDCsmConverter; -import org.netbeans.modules.cnd.utils.cache.CndFileUtils; -import org.netbeans.modules.cnd.utils.cache.TextCache; /** - * Basic walker to find macroes for semantic highlighting - * TODO: maybe it should be one walker for any semantic HL activity, because - * they used altogether. + * Walker to find macros used in file for semantic highlighting * * @author Sergey Grinev + * @author Vladimir Voskresensky */ -public class APTFindMacrosWalker extends APTDefinesCollectorWalker { - protected final Map macro2file = new HashMap(); +public final class APTFindMacrosWalker extends APTSelfWalker { + private final List references = new ArrayList(); public APTFindMacrosWalker(APTFile apt, CsmFile csmFile, APTPreprocHandler preprocHandler, APTFileCacheEntry cacheEntry) { super(apt, csmFile, preprocHandler, cacheEntry); @@ -101,13 +94,19 @@ protected void onDefine(APT apt) { APTDefine defineNode = (APTDefine) apt; APTToken name = defineNode.getName(); + MacroReference mr = null; if (name != null) { - MacroInfo mi = new MacroInfo(csmFile, defineNode.getOffset(), null); - CsmReference mf = new MacroReference(csmFile, name, mi); - references.add(mf); + mr = new MacroReference(csmFile, name, null, CsmReferenceKind.DECLARATION); + references.add(mr); } analyzeList(defineNode.getBody()); super.onDefine(apt); + if (mr != null) { + APTMacro m = getMacroMap().getMacro(name); + if (m != null) { + mr.setMacro(m); + } + } } @Override @@ -133,7 +132,6 @@ analyzeToken(((APTIfdef) apt).getMacroName(), false); return super.onIfdef(apt); } - private final List references = new ArrayList(); @Override protected void onUndef(APT apt) { @@ -153,15 +151,10 @@ super.onIncludeNext(apt); } - public List getCollectedData() { - return references; - } - - @Override - public TokenStream getTokenStream() { + public List collectMacros() { TokenStream ts = super.getTokenStream(); analyzeStream(ts, true); - return null; // tokenstream set to EOF? it's no good + return references; } private CsmReference analyzeToken(APTToken token, boolean addOnlyIfNotFunLikeMacro) { @@ -174,19 +167,7 @@ funLike = m.isFunctionLike(); switch(m.getKind()){ case DEFINED: - MacroInfo mi = getMacroInfo(token); - if (mi == null) { - CsmFile macroContainter = getMacroFile(m); - if (macroContainter != null) { - mi = new MacroInfo(macroContainter, m.getDefineNode().getOffset(), m.getFile()); - } - } - if (mi != null) { - mf = new MacroReference(csmFile, token, mi); - } else { - // as backup - mf = new SysMacroReference(csmFile, token, m); - } + mf = new MacroReference(csmFile, token, m, CsmReferenceKind.DIRECT_USAGE); break; case COMPILER_PREDEFINED: case POSITION_PREDEFINED: @@ -238,12 +219,13 @@ } } - private static class SysMacroReference extends OffsetableBase implements CsmReference { + private static final class SysMacroReference extends OffsetableBase implements CsmReference { private final CsmObject ref; - + private final CharSequence text; public SysMacroReference(CsmFile file, APTToken token, APTMacro macro) { super(file, token.getOffset(), token.getEndOffset()); + text = token.getTextID(); CsmMacro.Kind kind; switch(macro.getKind()) { case COMPILER_PREDEFINED: @@ -271,113 +253,108 @@ } public CsmObject getOwner() { - return null; + return getContainingFile(); } public CsmReferenceKind getKind() { - return CsmReferenceKind.DECLARATION; + return CsmReferenceKind.DIRECT_USAGE; } @Override public CharSequence getText() { - return TextCache.getManager().getString(super.getText()); + return text; } } - private static class MacroReference extends OffsetableBase implements CsmReference { + private static final class MacroReference extends OffsetableBase implements CsmReference { - private CsmObject ref; + private volatile CsmMacro ref = null; private final CharSequence macroName; - private final MacroInfo mi; - - public MacroReference(CsmFile file, APTToken macro, MacroInfo mi) { - super(file, macro.getOffset(), macro.getEndOffset()); - this.macroName = macro.getTextID(); + private APTMacro macro; + private final CsmReferenceKind kind; + public MacroReference(CsmFile macroUsageFile, APTToken macroUsageToken, APTMacro macro, CsmReferenceKind kind) { + super(macroUsageFile, macroUsageToken.getOffset(), macroUsageToken.getEndOffset()); + this.macroName = macroUsageToken.getTextID(); assert macroName != null; -// this.isSystem = isSystem != null ? isSystem.booleanValue() : mi != null; -// assert !(isSystem != null && isSystem.booleanValue() && mi != null); - this.mi = mi; + this.macro = macro; + this.kind = kind; } public CsmObject getReferencedObject() { - if (ref == null && mi != null) { - CsmFile target = getTargetFile(); - if (target != null) { - CsmFilter filter = CsmSelect.getFilterBuilder().createNameFilter(macroName, true, true, false); - for (Iterator it = CsmSelect.getMacros(target, filter); it.hasNext();) { - CsmMacro macro = it.next(); - if (macro!=null && mi.startOffset == macro.getStartOffset()) { - ref = macro; + CsmMacro refObj = ref; + if (refObj == null && macro != null) { + synchronized (this) { + refObj = ref; + if (refObj == null) { + int macroStartOffset = macro.getDefineNode().getOffset(); + CsmFile target = getTargetFile(); + if (target != null) { + CsmFilter filter = CsmSelect.getFilterBuilder().createNameFilter(macroName, true, true, false); + for (Iterator it = CsmSelect.getMacros(target, filter); it.hasNext();) { + CsmMacro targetFileMacro = it.next(); + if (targetFileMacro!=null && macroStartOffset == targetFileMacro.getStartOffset()) { + refObj = targetFileMacro; + break; + } + } + if (refObj == null) { + // reference was made so it was macro during APTFindMacrosWalker's walk. Parser missed this variance of header and + // we have to create MacroImpl for skipped filepart on the spot (see IZ#130897) + if (target instanceof Unresolved.UnresolvedFile) { + refObj = MacroImpl.createSystemMacro(macroName, "", target, CsmMacro.Kind.USER_SPECIFIED); + } else { + refObj = new MacroImpl(macroName, null, "", target, new OffsetableBase(target, macroStartOffset, macroStartOffset + macroName.length()), CsmMacro.Kind.DEFINED); + org.netbeans.modules.cnd.modelimpl.csm.core.Utils.setSelfUID(refObj); + } + } } - } - if (ref == null) { - // reference was made so it was macro during APTFindMacrosWalker's walk. Parser missed this variance of header and - // we have to create MacroImpl for skipped filepart on the spot (see IZ#130897) - if (target instanceof Unresolved.UnresolvedFile) { - ref = MacroImpl.createSystemMacro(macroName, "", target, CsmMacro.Kind.USER_SPECIFIED); - } else { - ref = new MacroImpl(macroName, null, "", target, new OffsetableBase(target, mi.startOffset, mi.startOffset+macroName.length()), CsmMacro.Kind.DEFINED); - org.netbeans.modules.cnd.modelimpl.csm.core.Utils.setSelfUID(ref); - } + ref = refObj; } } } - return ref; + return refObj; } private CsmFile getTargetFile() { - CsmFile current = UIDCsmConverter.UIDtoFile(mi.targetFile); - if (current != null && mi.includePath != null && mi.includePath.length() > 0) { - File searchFile = new File(mi.includePath.toString()); - ProjectBase targetPrj = ((ProjectBase) current.getProject()).findFileProject(searchFile.getAbsolutePath()); - if (targetPrj == null) { - searchFile = CndFileUtils.normalizeFile(searchFile); - targetPrj = ((ProjectBase) current.getProject()).findFileProject(searchFile.getAbsolutePath()); + CsmFile current = this.getContainingFile(); + CsmFile target; + if (kind == CsmReferenceKind.DECLARATION) { + target = current; + } else { + target = null; + CharSequence macroContainerFile = macro.getFile(); + if (current != null && macroContainerFile.length() > 0) { + ProjectBase targetPrj = ((ProjectBase) current.getProject()).findFileProject(macroContainerFile); + if (targetPrj != null) { + target = targetPrj.findFile(macroContainerFile); + } + // try full model? + if (target == null) { + target = CsmModelAccessor.getModel().findFile(macroContainerFile); + } + if (target == null && targetPrj != null) { + target = targetPrj.getUnresolvedFile(); + } } - if (targetPrj != null) { - current = targetPrj.getFile(searchFile, false); - // if file belongs to project, it should be not null - // but info could be obsolete - } - // try full model? -// if (current == null) { -// current = CsmModelAccessor.getModel().findFile(mi.includePath); -// } } - return current; + return target; } public CsmObject getOwner() { - return getTargetFile(); + return (kind == CsmReferenceKind.DECLARATION) ? getContainingFile() : getReferencedObject(); } public CsmReferenceKind getKind() { - return CsmReferenceKind.DECLARATION; + return kind; } @Override public CharSequence getText() { - return DefaultCache.getManager().getString(super.getText()); + return macroName; + } + + private void setMacro(APTMacro m) { + this.macro = m; } } - - private CsmFile getMacroFile(APTMacro m) { - CsmFile out = null; - CharSequence path = m.getFile(); - if (path.length() > 0) { - out = macro2file.get(path); - if (out == null) { - ProjectBase targetPrj = ((ProjectBase) csmFile.getProject()).findFileProject(path); - if (targetPrj != null) { - out = targetPrj.getFile(new File(path.toString()), false); - // if file belongs to project, it should be not null - // but info could be obsolete - } - if (out != null) { - macro2file.put(path, out); - } - } - } - return out; - } } \ No newline at end of file diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java @@ -51,8 +51,10 @@ import org.netbeans.modules.cnd.apt.support.APTIncludeHandler; import org.netbeans.modules.cnd.apt.support.APTIncludeHandler.IncludeInfo; import org.netbeans.modules.cnd.apt.support.APTMacroMap; +import org.netbeans.modules.cnd.apt.support.APTMacroMap.State; import org.netbeans.modules.cnd.apt.support.APTPreprocHandler; import org.netbeans.modules.cnd.apt.support.APTWalker; +import org.netbeans.modules.cnd.apt.support.ResolvedPath; import org.netbeans.modules.cnd.modelimpl.csm.core.FileImpl; import org.netbeans.modules.cnd.modelimpl.csm.core.ProjectBase; @@ -121,7 +123,8 @@ APTFileCacheEntry cacheEntry = csmFile.getAPTCacheEntry(preprocHandler, false); APTWalker walker = new APTRestorePreprocStateWalker(getStartProject(), aptLight, csmFile, preprocHandler, inclStack, interestedFile,cacheEntry); walker.visit(); - csmFile.setAPTCacheEntry(preprocHandler, cacheEntry, false); + // we do not remember cache entry as serial because stopped before #include directive + // csmFile.setAPTCacheEntry(preprocHandler, cacheEntry, false); } else { // expected #included file was deleted csmFile = null; @@ -135,6 +138,7 @@ APTFileCacheEntry cacheEntry = csmFile.getAPTCacheEntry(preprocHandler, false); APTWalker walker = new APTRestorePreprocStateWalker(getStartProject(), aptLight, csmFile, preprocHandler,cacheEntry); walker.visit(); + // remember walk info csmFile.setAPTCacheEntry(preprocHandler, cacheEntry, false); } else { // expected #included file was deleted @@ -170,6 +174,14 @@ // See IZ119620, IZ120478 } } - - + + @Override + protected boolean include(ResolvedPath resolvedPath, APTInclude apt, State postIncludeState) { + boolean ret = super.include(resolvedPath, apt, postIncludeState); + // does not allow to store post include state if we stopped before #include directive + if (hasIncludeActionSideEffects() && isStopped()) { + ret = false; + } + return ret; + } } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java @@ -37,6 +37,7 @@ import org.netbeans.modules.cnd.apt.support.APTAbstractWalker; import org.netbeans.modules.cnd.apt.support.APTDriver; import org.netbeans.modules.cnd.apt.support.APTFileCacheEntry; +import org.netbeans.modules.cnd.apt.support.APTFileCacheManager; import org.netbeans.modules.cnd.apt.support.APTMacroMap; import org.netbeans.modules.cnd.apt.support.APTPreprocHandler; import org.netbeans.modules.cnd.apt.support.APTWalker; @@ -68,7 +69,11 @@ if (resolvedPath != null && getIncludeHandler().pushInclude(resolvedPath.getPath(), aptInclude, resolvedPath.getIndex())) { try { APTFile apt = APTDriver.getInstance().findAPTLight(new FileBufferFile(new File(resolvedPath.getPath().toString()))); - createIncludeWalker(apt, this, resolvedPath.getPath()).visit(); + APTPreprocHandler preprocHandler = getPreprocHandler(); + APTFileCacheEntry cache = APTFileCacheManager.getEntry(resolvedPath.getPath(),preprocHandler, false); + createIncludeWalker(apt, this, resolvedPath.getPath(), cache).visit(); + // remember walk + APTFileCacheManager.setAPTCacheEntry(resolvedPath.getPath(), preprocHandler, cache, false); } catch (FileNotFoundException ex) { APTUtils.LOG.log(Level.WARNING, "APTSelfWalker: file {0} not found", new Object[] {resolvedPath.getPath()});// NOI18N DiagnosticExceptoins.register(ex); @@ -82,8 +87,8 @@ return postIncludeState == null; } - protected APTWalker createIncludeWalker(APTFile apt, APTSelfWalker parent, CharSequence includePath) { - return new APTSelfWalker(apt, parent.csmFile, parent.getPreprocHandler(), null); + protected APTWalker createIncludeWalker(APTFile apt, APTSelfWalker parent, CharSequence includePath, APTFileCacheEntry cache) { + return new APTSelfWalker(apt, parent.csmFile, parent.getPreprocHandler(), cache); } @Override diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/AbstractKey.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/AbstractKey.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/AbstractKey.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/AbstractKey.java @@ -76,6 +76,10 @@ return Behavior.Default; } + public boolean hasCache() { + return false; + } + public abstract int getSecondaryAt(int level); public abstract CharSequence getAt(int level); diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/ClassifierContainerKey.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/ClassifierContainerKey.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/ClassifierContainerKey.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/ClassifierContainerKey.java @@ -83,6 +83,11 @@ } @Override + public boolean hasCache() { + return true; + } + + @Override public String toString() { return "ClassifierContainerKey " + getProjectName(); // NOI18N } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/DeclarationContainerKey.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/DeclarationContainerKey.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/DeclarationContainerKey.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/DeclarationContainerKey.java @@ -87,4 +87,9 @@ public Key.Behavior getBehavior() { return Key.Behavior.LargeAndMutable; } + + @Override + public boolean hasCache() { + return true; + } } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/FileContainerKey.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/FileContainerKey.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/FileContainerKey.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/FileContainerKey.java @@ -50,7 +50,7 @@ * Key for FileContainer data * @author Vladimir Kvashin */ -public class FileContainerKey extends ProjectNameBasedKey { +final public class FileContainerKey extends ProjectNameBasedKey { public FileContainerKey(String project) { super(project); @@ -85,7 +85,7 @@ } @Override - public Key.Behavior getBehavior() { - return Key.Behavior.LargeAndMutable; + public boolean hasCache() { + return true; } } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/FileKey.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/FileKey.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/FileKey.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/FileKey.java @@ -83,4 +83,9 @@ assert level == 0; return KeyObjectFactory.KEY_FILE_KEY; } + + @Override + public boolean hasCache() { + return true; + } } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/GraphContainerKey.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/GraphContainerKey.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/GraphContainerKey.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/GraphContainerKey.java @@ -43,14 +43,13 @@ import java.io.DataInput; import java.io.IOException; import org.netbeans.modules.cnd.modelimpl.csm.core.CsmObjectFactory; -import org.netbeans.modules.cnd.repository.spi.Key; import org.netbeans.modules.cnd.repository.spi.PersistentFactory; /** * Key for GraphContainer data * @author Vladimir Kvashin */ -public class GraphContainerKey extends ProjectNameBasedKey { +final public class GraphContainerKey extends ProjectNameBasedKey { public GraphContainerKey(String project) { super(project); @@ -84,7 +83,7 @@ } @Override - public Key.Behavior getBehavior() { - return Key.Behavior.LargeAndMutable; + public boolean hasCache() { + return true; } } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/NamespaceDeclarationContainerKey.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/NamespaceDeclarationContainerKey.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/NamespaceDeclarationContainerKey.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/NamespaceDeclarationContainerKey.java @@ -43,12 +43,13 @@ import java.io.DataOutput; import java.io.IOException; import org.netbeans.modules.cnd.api.model.CsmNamespace; +import org.netbeans.modules.cnd.repository.spi.Key; /** * * @author Vladimir Voskresensky */ -public class NamespaceDeclarationContainerKey extends NamespaceKey { +final public class NamespaceDeclarationContainerKey extends NamespaceKey { public NamespaceDeclarationContainerKey(CsmNamespace ns) { super(ns); @@ -78,4 +79,14 @@ /*package*/ NamespaceDeclarationContainerKey(DataInput aStream) throws IOException { super(aStream); } + + @Override + public Key.Behavior getBehavior() { + return Behavior.LargeAndMutable; + } + + @Override + public boolean hasCache() { + return true; + } } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/NamespaceKey.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/NamespaceKey.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/NamespaceKey.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/NamespaceKey.java @@ -138,4 +138,9 @@ public Key.Behavior getBehavior() { return Behavior.LargeAndMutable; } + + @Override + public boolean hasCache() { + return true; + } } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/ProjectKey.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/ProjectKey.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/ProjectKey.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/ProjectKey.java @@ -88,5 +88,9 @@ public Key.Behavior getBehavior() { return Behavior.LargeAndMutable; } - + + @Override + public boolean hasCache() { + return true; + } } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/RepositoryUtils.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/RepositoryUtils.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/RepositoryUtils.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/repository/RepositoryUtils.java @@ -56,6 +56,7 @@ import org.netbeans.modules.cnd.modelimpl.csm.core.Disposable; import org.netbeans.modules.cnd.modelimpl.csm.core.ProjectBase; import org.netbeans.modules.cnd.modelimpl.debug.TraceFlags; +import org.netbeans.modules.cnd.modelimpl.uid.KeyBasedUID; import org.netbeans.modules.cnd.modelimpl.uid.UIDProviderIml; import org.netbeans.modules.cnd.repository.api.Repository; import org.netbeans.modules.cnd.repository.api.RepositoryAccessor; @@ -123,7 +124,7 @@ return counter++; } - public static void remove(CsmUID uid) { + public static void remove(CsmUID uid, CsmObject obj) { Key key = UIDtoKey(uid); if (key != null) { try { @@ -142,17 +143,22 @@ repository.remove(key); } } finally { - if (uid instanceof Disposable) { - ((Disposable)uid).dispose(); - } + disposeUID(uid, obj); } } } + @SuppressWarnings("unchecked") + public static void disposeUID(CsmUID uid, CsmObject obj) { + if (uid instanceof KeyBasedUID) { + ((KeyBasedUID)uid).dispose(obj); + } + } + public static void remove(Collection uids) { if (uids != null) { for (CsmUID uid : uids) { - remove(uid); + remove(uid, null); } } } diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/uid/KeyBasedUID.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/uid/KeyBasedUID.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/uid/KeyBasedUID.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/uid/KeyBasedUID.java @@ -71,6 +71,8 @@ return key; } + public abstract void dispose(T obj); + @Override public String toString() { String retValue; diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/uid/UIDUtilities.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/uid/UIDUtilities.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/uid/UIDUtilities.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/uid/UIDUtilities.java @@ -43,6 +43,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; +import java.lang.ref.Reference; +import java.lang.ref.SoftReference; import java.lang.ref.WeakReference; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; @@ -365,39 +367,44 @@ /** * Base UID for cached objects */ - /* package */ static class CachedUID extends KeyBasedUID implements Disposable { - private WeakReference weakT = TraceFlags.USE_WEAK_MEMORY_CACHE ? new WeakReference(null) : null; + /* package */ static class CachedUID extends KeyBasedUID { + private static final SoftReference DUMMY = new SoftReference(null); + private Reference weakT; - protected CachedUID(Key key) { + protected CachedUID(Key key, T obj) { super(key); + weakT = TraceFlags.USE_WEAK_MEMORY_CACHE && key.hasCache() ? new WeakReference(obj) : DUMMY; } - /* package */ CachedUID(DataInput aStream) throws IOException { + CachedUID(DataInput aStream) throws IOException { super(aStream); + weakT = TraceFlags.USE_WEAK_MEMORY_CACHE && getKey().hasCache() ? new WeakReference(null) : DUMMY; } @Override + @SuppressWarnings("unchecked") public T getObject() { T out = null; - WeakReference weak = null; - if (TraceFlags.USE_WEAK_MEMORY_CACHE) { - weak = weakT; - if (weak != null) { - out = weak.get(); - if (out != null) { - return out; - } + Reference weak = (Reference) weakT; + if (weak != DUMMY) { + out = weak.get(); + if (out != null) { + return out; } } out = RepositoryUtils.get(this); - if (TraceFlags.USE_WEAK_MEMORY_CACHE && out != null && weak != null) { - weakT = new WeakReference(out); + if (out != null && weak != DUMMY) { + weakT = (Reference) new WeakReference(out); } return out; } - public void dispose() { - weakT = null; + public void dispose(T obj) { + if (obj == null) { + weakT = DUMMY; + } else { + weakT = new SoftReference(obj); + } } } @@ -407,7 +414,7 @@ /* package */ static final class ProjectUID extends CachedUID { //KeyBasedUID { public ProjectUID(ProjectBase project) { - super(KeyUtilities.createProjectKey(project)); + super(KeyUtilities.createProjectKey(project), project); } /* package */ ProjectUID(DataInput aStream) throws IOException { @@ -421,7 +428,7 @@ /* package */ static final class NamespaceUID extends CachedUID { //KeyBasedUID { public NamespaceUID(CsmNamespace ns) { - super(KeyUtilities.createNamespaceKey(ns)); + super(KeyUtilities.createNamespaceKey(ns), ns); } /* package */ NamespaceUID(DataInput aStream) throws IOException { @@ -435,7 +442,7 @@ /* package */ static final class FileUID extends CachedUID { //KeyBasedUID { public FileUID(FileImpl file) { - super(KeyUtilities.createFileKey(file)); + super(KeyUtilities.createFileKey(file), file); } /* package */ FileUID(DataInput aStream) throws IOException { @@ -446,14 +453,14 @@ /** * base UID for CsmDeclaration */ - private static abstract class OffsetableDeclarationUIDBase extends KeyBasedUID { + private static abstract class OffsetableDeclarationUIDBase extends CachedUID { //KeyBasedUID { public OffsetableDeclarationUIDBase(T declaration) { - this(KeyUtilities.createOffsetableDeclarationKey((OffsetableDeclarationBase) declaration)); + this(KeyUtilities.createOffsetableDeclarationKey((OffsetableDeclarationBase) declaration), declaration); } - protected OffsetableDeclarationUIDBase(Key key) { - super(key); + protected OffsetableDeclarationUIDBase(Key key, T obj) { + super(key, obj); } /* package */ OffsetableDeclarationUIDBase(DataInput aStream) throws IOException { @@ -477,11 +484,11 @@ private static abstract class OffsetableDeclarationUIDBaseCached extends CachedUID { //KeyBasedUID { public OffsetableDeclarationUIDBaseCached(T declaration) { - this(KeyUtilities.createOffsetableDeclarationKey((OffsetableDeclarationBase) declaration)); + this(KeyUtilities.createOffsetableDeclarationKey((OffsetableDeclarationBase) declaration), declaration); } - protected OffsetableDeclarationUIDBaseCached(Key key) { - super(key); + protected OffsetableDeclarationUIDBaseCached(Key key, T obj) { + super(key, obj); } /* package */ OffsetableDeclarationUIDBaseCached(DataInput aStream) throws IOException { @@ -527,10 +534,10 @@ /** * UID for CsmMacro */ - /* package */ static final class MacroUID extends KeyBasedUID { + /* package */ static final class MacroUID extends CachedUID { //KeyBasedUID { public MacroUID(CsmMacro macro) { - super(KeyUtilities.createMacroKey(macro)); + super(KeyUtilities.createMacroKey(macro), macro); } /* package */ MacroUID(DataInput aStream) throws IOException { @@ -541,10 +548,10 @@ /** * UID for CsmInclude */ - /* package */ static final class IncludeUID extends KeyBasedUID { + /* package */ static final class IncludeUID extends CachedUID { //KeyBasedUID { public IncludeUID(CsmInclude incl) { - super(KeyUtilities.createIncludeKey(incl)); + super(KeyUtilities.createIncludeKey(incl), incl); } /* package */ IncludeUID(DataInput aStream) throws IOException { @@ -555,10 +562,10 @@ /** * UID for CsmParameterList */ - /* package */ static final class ParamListUID extends KeyBasedUID> { + /* package */ static final class ParamListUID extends CachedUID> { //KeyBasedUID> { public ParamListUID(CsmParameterList paramList) { - super(KeyUtilities.createParamListKey(paramList)); + super(KeyUtilities.createParamListKey(paramList), paramList); } /* package */ ParamListUID(DataInput aStream) throws IOException { @@ -610,7 +617,7 @@ /* package */ static final class UnnamedClassifierUID extends OffsetableDeclarationUIDBase { public UnnamedClassifierUID(T classifier, int index) { - super(KeyUtilities.createUnnamedOffsetableDeclarationKey((OffsetableDeclarationBase) classifier, index)); + super(KeyUtilities.createUnnamedOffsetableDeclarationKey((OffsetableDeclarationBase) classifier, index), classifier); } /* package */ UnnamedClassifierUID(DataInput aStream) throws IOException { @@ -629,7 +636,7 @@ /* package */ static final class UnnamedOffsetableDeclarationUID extends OffsetableDeclarationUIDBase { public UnnamedOffsetableDeclarationUID(T decl, int index) { - super(KeyUtilities.createUnnamedOffsetableDeclarationKey((OffsetableDeclarationBase) decl, index)); + super(KeyUtilities.createUnnamedOffsetableDeclarationKey((OffsetableDeclarationBase) decl, index), decl); } /* package */ UnnamedOffsetableDeclarationUID(DataInput aStream) throws IOException { diff --git a/cnd.remote/src/org/netbeans/modules/cnd/remote/sync/Bundle.properties b/cnd.remote/src/org/netbeans/modules/cnd/remote/sync/Bundle.properties --- a/cnd.remote/src/org/netbeans/modules/cnd/remote/sync/Bundle.properties +++ b/cnd.remote/src/org/netbeans/modules/cnd/remote/sync/Bundle.properties @@ -44,3 +44,13 @@ #in fact, description is not displayed in the UI in 6.7 SCP_Factory_Description=Use secure copy (scp) protocol for synchronization. SHARED_Factory_Description=Do not use synchronization. This assumes that project files reside in a shared directory that is visible from remote host. + +# {0} is the target directory; {1} is the target host display name +MSG_Copying=Copying project files to {0} at {1} + +# {0} is the target host display name +MSG_Cant_find_sync_root=Can not find directory to copy project to on host {0} + +# {0} is the target directory; {1} is the target host display name; +# {2} is the error message extracted from exception +MSG_Error_Copying=Error copying project files to {0} at {1}: \n{2} diff --git a/cnd.remote/src/org/netbeans/modules/cnd/remote/sync/ScpSyncWorker.java b/cnd.remote/src/org/netbeans/modules/cnd/remote/sync/ScpSyncWorker.java --- a/cnd.remote/src/org/netbeans/modules/cnd/remote/sync/ScpSyncWorker.java +++ b/cnd.remote/src/org/netbeans/modules/cnd/remote/sync/ScpSyncWorker.java @@ -49,10 +49,12 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.netbeans.modules.cnd.api.remote.RemoteSyncWorker; +import org.netbeans.modules.cnd.api.remote.ServerList; import org.netbeans.modules.cnd.remote.mapper.RemotePathMap; import org.netbeans.modules.cnd.remote.support.RemoteUtil; import org.netbeans.modules.nativeexecution.api.ExecutionEnvironment; import org.netbeans.modules.nativeexecution.api.util.CommonTasksSupport; +import org.openide.util.NbBundle; /** * @@ -88,36 +90,48 @@ public boolean synchronize() { - // determine the remote directory - RemotePathMap mapper = RemotePathMap.getRemotePathMapInstance(executionEnvironment); +// // determine the remote directory +// RemotePathMap mapper = RemotePathMap.getRemotePathMapInstance(executionEnvironment); +// +// // probably mapper already knows it? +// String remoteDir = mapper.getRemotePath(this.localDir.getAbsolutePath(), false); +// if (remoteDir == null) { +// // mapper does not know dir; let's check its parent +// String localParent = this.localDir.getParentFile().getAbsolutePath(); +// String remoteParent = mapper.getRemotePath(localParent, false); +// boolean addMapping = false; +// if (remoteParent == null) { +// // we can't map parent path either +// addMapping = true; +// remoteParent = getRemoteSyncRoot(); +// if (remoteParent == null) { +// if (mapper.checkRemotePath(localDir.getAbsolutePath(), true)) { +// remoteDir = mapper.getRemotePath(this.localDir.getAbsolutePath(), false); +// addMapping = false; +// } else { +// return false; +// } +// } +// } +// if (remoteDir == null) { +// remoteDir = remoteParent + '/' + localDir.getName(); //NOI18N +// } +// if (addMapping) { +// mapper.addMapping(localParent, remoteParent); +// } +// } - // probably mapper already knows it? - String remoteDir = mapper.getRemotePath(this.localDir.getAbsolutePath(), false); - if (remoteDir == null) { - // mapper does not know dir; let's check its parent - String localParent = this.localDir.getParentFile().getAbsolutePath(); - String remoteParent = mapper.getRemotePath(localParent, false); - boolean addMapping = false; - if (remoteParent == null) { - // we can't map parent path either - addMapping = true; - remoteParent = getRemoteSyncRoot(); - if (remoteParent == null) { - if (mapper.checkRemotePath(localDir.getAbsolutePath(), true)) { - remoteDir = mapper.getRemotePath(this.localDir.getAbsolutePath(), false); - addMapping = false; - } else { - return false; - } - } + // We should make no implicit assumptions. + // Later we'll allow user to specify where to copy project files to + String remoteParent = getRemoteSyncRoot(); + if (remoteParent == null) { + if (err != null) { + err.printf("%s\n", NbBundle.getMessage(getClass(), "MSG_Cant_find_sync_root", ServerList.get(executionEnvironment).toString())); } - if (remoteDir == null) { - remoteDir = remoteParent + '/' + localDir.getName(); //NOI18N - } - if (addMapping) { - mapper.addMapping(localParent, remoteParent); - } + return false; // TODO: } + String remoteDir = remoteParent + '/' + localDir.getName(); //NOI18N + boolean success = false; try { boolean same; @@ -131,8 +145,14 @@ (same ? " are same - skipping" : " arent same - copying")); //NOI18N } if (!same) { + if (out != null) { + out.printf("%s\n", NbBundle.getMessage(getClass(), "MSG_Copying", + remoteDir, ServerList.get(executionEnvironment).toString())); + } synchronizeImpl(remoteDir); } + RemotePathMap mapper = RemotePathMap.getRemotePathMapInstance(executionEnvironment); + mapper.addMapping(localDir.getParentFile().getAbsolutePath(), remoteParent); success = true; } catch (InterruptedException ex) { // reporting does not make sense, just return false @@ -142,8 +162,16 @@ logger.log(Level.FINEST, null, ex); } catch (ExecutionException ex) { logger.log(Level.FINE, null, ex); + if (err != null) { + err.printf("%s\n", NbBundle.getMessage(getClass(), "MSG_Error_Copying", + remoteDir, ServerList.get(executionEnvironment).toString(), ex.getLocalizedMessage())); + } } catch (IOException ex) { logger.log(Level.FINE, null, ex); + if (err != null) { + err.printf("%s asdasd \n", NbBundle.getMessage(getClass(), "MSG_Error_Copying", + remoteDir, ServerList.get(executionEnvironment).toString(), ex.getLocalizedMessage())); + } } return success; } diff --git a/cnd.repository.api/src/org/netbeans/modules/cnd/repository/spi/Key.java b/cnd.repository.api/src/org/netbeans/modules/cnd/repository/spi/Key.java --- a/cnd.repository.api/src/org/netbeans/modules/cnd/repository/spi/Key.java +++ b/cnd.repository.api/src/org/netbeans/modules/cnd/repository/spi/Key.java @@ -76,6 +76,12 @@ * @return key Behavior */ Behavior getBehavior(); + + /** + * return true if key may have a local L1 cache + * @return + */ + public boolean hasCache(); /** returns depth of primary key's hierarchy * * @return depth of primary key's hierarchy diff --git a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/disk/MemoryCacheTest.java b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/disk/MemoryCacheTest.java --- a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/disk/MemoryCacheTest.java +++ b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/disk/MemoryCacheTest.java @@ -216,5 +216,9 @@ public int getSecondaryAt(int level) { throw new UnsupportedOperationException("Not supported yet."); } + + public boolean hasCache() { + return false; + } } } diff --git a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/TryGetTest.java b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/TryGetTest.java --- a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/TryGetTest.java +++ b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/TryGetTest.java @@ -104,6 +104,10 @@ public Key.Behavior getBehavior() { return Key.Behavior.Default; } + + public boolean hasCache() { + return false; + } } private class LargeKey extends BaseKey { @@ -115,6 +119,10 @@ public Key.Behavior getBehavior() { return Key.Behavior.LargeAndMutable; } + + public boolean hasCache() { + return false; + } } private static class Value implements Persistent { diff --git a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/test/TestKey.java b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/test/TestKey.java --- a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/test/TestKey.java +++ b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/test/TestKey.java @@ -147,4 +147,7 @@ output.writeBoolean(behavior == Behavior.LargeAndMutable); } + public boolean hasCache() { + return false; + } } diff --git a/dlight.core.stack/src/org/netbeans/modules/dlight/core/stack/dataprovider/impl/FunctionsListDataProviderImpl.java b/dlight.core.stack/src/org/netbeans/modules/dlight/core/stack/dataprovider/impl/FunctionsListDataProviderImpl.java --- a/dlight.core.stack/src/org/netbeans/modules/dlight/core/stack/dataprovider/impl/FunctionsListDataProviderImpl.java +++ b/dlight.core.stack/src/org/netbeans/modules/dlight/core/stack/dataprovider/impl/FunctionsListDataProviderImpl.java @@ -93,7 +93,7 @@ Lookup.getDefault().lookupAll(SourceFileInfoProvider.class); for (SourceFileInfoProvider provider : sourceInfoProviders) { - final SourceFileInfo sourceInfo = provider.fileName(functionCall.getFunction().getName(), functionCall.getOffset(), serviceInfoStorage.getInfo()); + final SourceFileInfo sourceInfo = provider.fileName(functionCall.getFunction().getName(), -1, functionCall.getOffset(), serviceInfoStorage.getInfo()); if (sourceInfo != null && sourceInfo.isSourceKnown()) { return sourceInfo; } diff --git a/dlight.core.stack/src/org/netbeans/modules/dlight/core/stack/dataprovider/impl/StackDataProviderImpl.java b/dlight.core.stack/src/org/netbeans/modules/dlight/core/stack/dataprovider/impl/StackDataProviderImpl.java --- a/dlight.core.stack/src/org/netbeans/modules/dlight/core/stack/dataprovider/impl/StackDataProviderImpl.java +++ b/dlight.core.stack/src/org/netbeans/modules/dlight/core/stack/dataprovider/impl/StackDataProviderImpl.java @@ -117,7 +117,7 @@ Lookup.getDefault().lookupAll(SourceFileInfoProvider.class); for (SourceFileInfoProvider provider : sourceInfoProviders) { - final SourceFileInfo sourceInfo = provider.fileName(functionCall.getFunction().getName(), functionCall.getOffset(), serviceInfoDataStorage.getInfo()); + final SourceFileInfo sourceInfo = provider.fileName(functionCall.getFunction().getName(), -1, functionCall.getOffset(), serviceInfoDataStorage.getInfo()); if (sourceInfo != null && sourceInfo.isSourceKnown()) { return sourceInfo; } diff --git a/dlight.dtrace/src/org/netbeans/modules/dlight/dtrace/collector/support/DtraceDataCollector.java b/dlight.dtrace/src/org/netbeans/modules/dlight/dtrace/collector/support/DtraceDataCollector.java --- a/dlight.dtrace/src/org/netbeans/modules/dlight/dtrace/collector/support/DtraceDataCollector.java +++ b/dlight.dtrace/src/org/netbeans/modules/dlight/dtrace/collector/support/DtraceDataCollector.java @@ -530,6 +530,8 @@ private final class ProcessLineCallBackImpl implements ProcessLineCallback { + private long maxTimestamp; + public void processLine(String line) { DataRow dataRow = parser.process(line); if (dataRow != null) { @@ -537,21 +539,39 @@ storage.addData( tableMetaData.getName(), Arrays.asList(dataRow)); } - synchronized (indicatorDataBuffer) { - indicatorDataBuffer.add(dataRow); - if (indicatorDataBuffer.size() >= indicatorFiringFactor) { - if (isSlave) { - if (handler != null) { - handler.notify(indicatorDataBuffer); + long curTimestamp = getTimestamp(dataRow); + if (curTimestamp == -1 || maxTimestamp < curTimestamp) { + synchronized (indicatorDataBuffer) { + if (curTimestamp != -1) { + maxTimestamp = curTimestamp; + } + indicatorDataBuffer.add(dataRow); + if (indicatorDataBuffer.size() >= indicatorFiringFactor) { + if (isSlave) { + if (handler != null) { + handler.notify(indicatorDataBuffer); + } + } else { + notifyIndicators(indicatorDataBuffer); } - } else { - notifyIndicators(indicatorDataBuffer); + indicatorDataBuffer.clear(); } - indicatorDataBuffer.clear(); } } } } + + private long getTimestamp(DataRow row) { + Object timestamp = row.getData("timestamp"); // NOI18N + if (timestamp instanceof Number) { + return ((Number)timestamp).longValue(); + } else if (timestamp instanceof String) { + try { + return Long.parseLong((String)timestamp); + } catch (NumberFormatException ex) {} + } + return -1; + } } private class DtraceInputProcessorFactory implements InputProcessorFactory { diff --git a/dlight.memory/src/org/netbeans/modules/dlight/memory/resources/mem.d b/dlight.memory/src/org/netbeans/modules/dlight/memory/resources/mem.d --- a/dlight.memory/src/org/netbeans/modules/dlight/memory/resources/mem.d +++ b/dlight.memory/src/org/netbeans/modules/dlight/memory/resources/mem.d @@ -1,5 +1,9 @@ #!/usr/sbin/dtrace -ZCs #pragma D option quiet +#pragma D option bufsize=16m +#pragma D option switchrate=100hz +#pragma D option dynvarsize=16m +#pragma D option cleanrate=100hz /* the current total amount of memory allocated and not freed */ int total; diff --git a/dlight.perfan/src/org/netbeans/modules/dlight/perfan/dataprovider/SSStackDataProvider.java b/dlight.perfan/src/org/netbeans/modules/dlight/perfan/dataprovider/SSStackDataProvider.java --- a/dlight.perfan/src/org/netbeans/modules/dlight/perfan/dataprovider/SSStackDataProvider.java +++ b/dlight.perfan/src/org/netbeans/modules/dlight/perfan/dataprovider/SSStackDataProvider.java @@ -264,7 +264,7 @@ Lookup.getDefault().lookupAll(SourceFileInfoProvider.class); for (SourceFileInfoProvider provider : sourceInfoProviders) { - final SourceFileInfo sourceInfo = provider.fileName(functionCall.getFunction().getName(), functionCall.getOffset(), this.storage.getInfo()); + final SourceFileInfo sourceInfo = provider.fileName(functionCall.getFunction().getName(), (int)functionCall.getOffset(), -1, this.storage.getInfo()); if (sourceInfo != null && sourceInfo.isSourceKnown()) { return sourceInfo; } diff --git a/dlight.spi/src/org/netbeans/modules/dlight/spi/SourceFileInfoProvider.java b/dlight.spi/src/org/netbeans/modules/dlight/spi/SourceFileInfoProvider.java --- a/dlight.spi/src/org/netbeans/modules/dlight/spi/SourceFileInfoProvider.java +++ b/dlight.spi/src/org/netbeans/modules/dlight/spi/SourceFileInfoProvider.java @@ -46,7 +46,7 @@ */ public interface SourceFileInfoProvider { - SourceFileInfo fileName(String functionName, long offset, Map serviceInfo); + SourceFileInfo fileName(String functionName, int lineNumber, long offset, Map serviceInfo); public final class SourceFileInfo { diff --git a/dlight.visualizers/src/org/netbeans/modules/dlight/visualizers/api/impl/OpenFunctionInEditorActionProvider.java b/dlight.visualizers/src/org/netbeans/modules/dlight/visualizers/api/impl/OpenFunctionInEditorActionProvider.java --- a/dlight.visualizers/src/org/netbeans/modules/dlight/visualizers/api/impl/OpenFunctionInEditorActionProvider.java +++ b/dlight.visualizers/src/org/netbeans/modules/dlight/visualizers/api/impl/OpenFunctionInEditorActionProvider.java @@ -36,7 +36,7 @@ Lookup.getDefault().lookupAll(SourceFileInfoProvider.class); for (SourceFileInfoProvider provider : sourceInfoProviders) { - final SourceFileInfo sourceInfo = provider.fileName(functionName, 0, null); + final SourceFileInfo sourceInfo = provider.fileName(functionName, 0, 0, null); if (sourceInfo != null && sourceInfo.isSourceKnown()) { DLightExecutorService.submit(new Runnable() { # HG changeset patch # User ffjre@netbeans.org # Date 1243998107 -14400 # Node ID 40fdf9a5c0b589c7878a5b9bddedb2d12dcfec09 # Parent 12a70ef2b544b87f4f3abc51baf68e4a511a0283 # Parent 308f6a2b90f228e9007998383b183bdc34f79e09 Automated merge with http://hg.netbeans.org/web-main diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-nbm.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-nbm.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-nbm.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-nbm.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-netbeans-platform.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-netbeans-platform.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-netbeans-platform.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-netbeans-platform.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-open-apis.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-open-apis.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-open-apis.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-open-apis.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-sfs-browser.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-sfs-browser.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-sfs-browser.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-sfs-browser.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-xml-layers.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-xml-layers.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-xml-layers.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/about-xml-layers.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/modules_process.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/modules_process.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/modules_process.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/modules_process.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/modules_quickref.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/modules_quickref.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/modules_quickref.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/modules_quickref.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/nbmodule-about-system-filesystem.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/nbmodule-about-system-filesystem.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/nbmodule-about-system-filesystem.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/nbmodule-about-system-filesystem.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/nbmodule-about.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/nbmodule-about.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/nbmodule-about.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/nbmodule-about.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/richclientapp_process.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/richclientapp_process.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/richclientapp_process.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/about/richclientapp_process.html @@ -1,7 +1,7 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_jnlp.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_jnlp.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_jnlp.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_jnlp.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_nbm.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_nbm.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_nbm.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_nbm.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_plugins.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_plugins.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_plugins.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_plugins.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_zip.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_zip.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_zip.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/build_plugin/building_zip.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/about_create.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/about_create.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/about_create.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/about_create.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/apisupport_extending_skeletons.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/apisupport_extending_skeletons.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/apisupport_extending_skeletons.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/apisupport_extending_skeletons.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/apisupport_searching_apis.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/apisupport_searching_apis.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/apisupport_searching_apis.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/apisupport_searching_apis.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_actions.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_actions.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_actions.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_actions.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_code_generators.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_code_generators.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_code_generators.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_code_generators.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_file_types.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_file_types.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_file_types.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_file_types.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_file_wizards.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_file_wizards.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_file_wizards.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_file_wizards.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_j2se_library_descs.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_j2se_library_descs.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_j2se_library_descs.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_j2se_library_descs.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_language_support.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_language_support.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_language_support.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_language_support.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_options_panels.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_options_panels.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_options_panels.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_options_panels.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_project_templates.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_project_templates.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_project_templates.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_project_templates.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_quick_search_providers.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_quick_search_providers.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_quick_search_providers.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_quick_search_providers.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_update_centers.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_update_centers.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_update_centers.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_update_centers.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_window_components.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_window_components.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_window_components.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_window_components.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_wizards.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_wizards.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_wizards.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/about_wizards.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_code_generator.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_code_generator.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_code_generator.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_code_generator.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_file_type.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_file_type.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_file_type.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_file_type.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_javahelp.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_javahelp.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_javahelp.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_javahelp.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_language_support.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_language_support.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_language_support.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_language_support.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_license.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_license.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_license.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_license.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_module_installers.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_module_installers.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_module_installers.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_module_installers.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_options_panels.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_options_panels.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_options_panels.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_options_panels.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_project_template.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_project_template.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_project_template.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_project_template.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_quick_search_provider.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_quick_search_provider.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_quick_search_provider.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_quick_search_provider.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_uc_manually.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_uc_manually.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_uc_manually.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_uc_manually.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_update_centers.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_update_centers.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_update_centers.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_update_centers.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_window_component.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_window_component.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_window_component.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_window_component.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_wizard.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_wizard.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_wizard.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/filelevel_create/create_wizard.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/libs_jhelp/about_libs_jhelp.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/libs_jhelp/about_libs_jhelp.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/libs_jhelp/about_libs_jhelp.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/libs_jhelp/about_libs_jhelp.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/netbeans_api_javadoc.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/netbeans_api_javadoc.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/netbeans_api_javadoc.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/netbeans_api_javadoc.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/about_project_wizards.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/about_project_wizards.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/about_project_wizards.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/about_project_wizards.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_library_wrapper.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_library_wrapper.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_library_wrapper.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_library_wrapper.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_module.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_module.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_module.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_module.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_module_suite.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_module_suite.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_module_suite.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_module_suite.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_platform_app.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_platform_app.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_platform_app.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/projectlevel_create/create_platform_app.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/using_netbeans_api_javadoc.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/using_netbeans_api_javadoc.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/using_netbeans_api_javadoc.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/create_plugin/using_netbeans_api_javadoc.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/credits.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/credits.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/credits.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/credits.html @@ -1,6 +1,6 @@ @@ -14,7 +14,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. +Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved. and Distribution License (the License). You may not use this file except in compliance with the License. @@ -30,7 +30,7 @@

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun +Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

Note: Sun is not responsible for the availability of third-party web diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/branding_plugins.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/branding_plugins.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/branding_plugins.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/branding_plugins.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/branding_window_system.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/branding_window_system.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/branding_window_system.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/branding_window_system.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/creating_splash_screen.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/creating_splash_screen.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/creating_splash_screen.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/creating_splash_screen.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/deploying_plugins.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/deploying_plugins.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/deploying_plugins.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/deploying_plugins.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/distributing_plugins.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/distributing_plugins.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/distributing_plugins.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/distributing_plugins.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/generate_autoupdate_descriptor.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/generate_autoupdate_descriptor.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/generate_autoupdate_descriptor.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/generate_autoupdate_descriptor.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/install_devide.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/install_devide.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/install_devide.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/install_devide.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/install_targetplatform.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/install_targetplatform.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/install_targetplatform.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/install_targetplatform.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/installing_plugins.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/installing_plugins.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/installing_plugins.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/installing_plugins.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/remove_unwanted_modules.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/remove_unwanted_modules.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/remove_unwanted_modules.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/remove_unwanted_modules.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/run_rich_client.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/run_rich_client.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/run_rich_client.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/distribute_plugin/run_rich_client.html @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/nbmodule-toc.xml b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/nbmodule-toc.xml --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/nbmodule-toc.xml +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/nbmodule-toc.xml @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/nbmodules.hs b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/nbmodules.hs --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/nbmodules.hs +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/nbmodules.hs @@ -1,6 +1,6 @@ diff --git a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/tbd.html b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/tbd.html --- a/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/tbd.html +++ b/apisupport.project/javahelp/org/netbeans/modules/apisupport/project/docs/tbd.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/about.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/about.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/about.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/about.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/create_project.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/create_project.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/create_project.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/create_project.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/create_sample.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/create_sample.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/create_sample.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/create_sample.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/project_lifecycle.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/project_lifecycle.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/project_lifecycle.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/basics/project_lifecycle.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/bpelhelp.hs b/bpel.help/javahelp/org/netbeans/modules/bpel/help/bpelhelp.hs --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/bpelhelp.hs +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/bpelhelp.hs @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

The contents of this file are subject to the terms of the Common Development and Distribution License (the License). You may not use this file except in compliance with the License.

You can obtain a copy of the License at http://www.netbeans.org/cddl.html or http://www.netbeans.org/cddl.txt.

When distributing Covered Code, include this CDDL Header Notice in each file and include the License file at http://www.netbeans.org/cddl.txt. If applicable, add the following below the CDDL Header, with the fields enclosed by brackets [] replaced by your own identifying information: "Portions Copyrighted [year] [name of copyright owner]"

-

The Original Software is NetBeans. The Initial Developer of the Original Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.

+

The Original Software is NetBeans. The Initial Developer of the Original Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

Note: Sun is not responsible for the availability of third-party web sites mentioned in this document and does not endorse and is not responsible or liable for any content, advertising, products, or other materials on or available from such sites or resources. Sun will not be responsible or liable for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods, or services available on or through any such sites or resources.

diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/about.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/about.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/about.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/about.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/breakpoints.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/breakpoints.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/breakpoints.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/breakpoints.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_execution.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_execution.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_execution.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_execution.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_partner_links.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_partner_links.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_partner_links.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_partner_links.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_process.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_process.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_process.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_process.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_sessions.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_sessions.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_sessions.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_sessions.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_threads.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_threads.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_threads.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_threads.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_variables.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_variables.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_variables.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/debug_windows_variables.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/fault_breakpoints.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/fault_breakpoints.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/fault_breakpoints.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/fault_breakpoints.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/monitor_debugger.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/monitor_debugger.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/monitor_debugger.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/monitor_debugger.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/start_stop.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/start_stop.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/start_stop.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/start_stop.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/watches.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/watches.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/watches.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/debug/watches.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/about_correlation_and_wizard.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/about_correlation_and_wizard.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/about_correlation_and_wizard.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/about_correlation_and_wizard.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/add_props_navigator.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/add_props_navigator.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/add_props_navigator.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/add_props_navigator.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/apply_filters.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/apply_filters.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/apply_filters.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/apply_filters.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/change_message_flow.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/change_message_flow.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/change_message_flow.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/change_message_flow.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/collapse_show.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/collapse_show.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/collapse_show.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/collapse_show.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/create_correlation_manually.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/create_correlation_manually.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/create_correlation_manually.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/create_correlation_manually.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/create_diagram.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/create_diagram.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/create_diagram.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/create_diagram.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/documentation.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/documentation.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/documentation.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/documentation.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/finding_usages.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/finding_usages.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/finding_usages.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/finding_usages.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/import_wsdl_resources.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/import_wsdl_resources.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/import_wsdl_resources.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/import_wsdl_resources.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/open_diag.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/open_diag.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/open_diag.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/open_diag.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/using_find.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/using_find.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/using_find.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/using_find.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/validation.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/validation.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/validation.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/validation.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/ww_diagram_element_props.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/ww_diagram_element_props.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/ww_diagram_element_props.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/design/ww_diagram_element_props.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/about.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/about.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/about.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/about.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/about_variable.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/about_variable.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/about_variable.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/about_variable.html @@ -1,6 +1,6 @@ @@ -38,7 +38,7 @@ You can copy data from one variable to another variable using the BPEL Mapper. See Creating BPEL Mappings for details about copying data.

Using the BPEL Mapper you can also create an XPath 1.0 expression for a business process element that requires this expression.

Refactoring

-

The BPEL Designer automatically synchronizes the names of defined variables and their usages. For example, when you rename a variable, all its usages are adjusted automatically to reflect the new name, including the usage of this variable name inside XPath expressions. See Refactoring in BPEL Processes for details about the refactoring rules in the BPEL Designer.

+

The BPEL Designer automatically synchronizes the names of defined variables and their usages. For example, when you rename a variable, all its usages are adjusted automatically to reflect the new name, including the usage of this variable name inside XPath expressions.

See Also
Creating Variables
diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_compensation_handler.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_compensation_handler.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_compensation_handler.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_compensation_handler.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler_onalarm.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler_onalarm.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler_onalarm.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler_onalarm.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler_onevent.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler_onevent.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler_onevent.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_event_handler_onevent.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_termination_handler.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_termination_handler.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_termination_handler.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/add_termination_handler.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/assign.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/assign.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/assign.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/assign.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/compensate.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/compensate.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/compensate.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/compensate.html @@ -1,7 +1,7 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/compensatescope.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/compensatescope.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/compensatescope.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/compensatescope.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/create_variable.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/create_variable.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/create_variable.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/create_variable.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/empty.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/empty.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/empty.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/empty.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/exit.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/exit.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/exit.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/exit.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/flow.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/flow.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/flow.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/flow.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/for_each.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/for_each.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/for_each.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/for_each.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/if.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/if.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/if.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/if.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/invoke.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/invoke.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/invoke.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/invoke.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_basic_acts.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_basic_acts.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_basic_acts.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_basic_acts.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_struct_acts.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_struct_acts.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_struct_acts.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_struct_acts.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_web_svc.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_web_svc.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_web_svc.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/palette_web_svc.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/partner_link.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/partner_link.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/partner_link.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/partner_link.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/pick.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/pick.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/pick.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/pick.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/receive.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/receive.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/receive.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/receive.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/repeat_until.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/repeat_until.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/repeat_until.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/repeat_until.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/reply.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/reply.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/reply.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/reply.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/rethrow.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/rethrow.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/rethrow.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/rethrow.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_catch.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_catch.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_catch.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_catch.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_catch_all.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_catch_all.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_catch_all.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_catch_all.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_fault_handler.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_fault_handler.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_fault_handler.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/scope_add_fault_handler.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/sequence.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/sequence.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/sequence.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/sequence.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/throw.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/throw.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/throw.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/throw.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/wait.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/wait.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/wait.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/wait.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/while.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/while.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/while.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/elements/while.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/logging/about_logging.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/logging/about_logging.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/logging/about_logging.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/logging/about_logging.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/about_mapper.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/about_mapper.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/about_mapper.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/about_mapper.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_functions.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_functions.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_functions.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_functions.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_mappings.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_mappings.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_mappings.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_mappings.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_predicates.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_predicates.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_predicates.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/mapper/mapper_predicates.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/add_correlation_props.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/add_correlation_props.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/add_correlation_props.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/add_correlation_props.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/add_imports_props.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/add_imports_props.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/add_imports_props.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/add_imports_props.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/bpel_process_wizard.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/bpel_process_wizard.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/bpel_process_wizard.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/bpel_process_wizard.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/bpel_project_props.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/bpel_project_props.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/bpel_project_props.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/bpel_project_props.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/correlation_invoke_props.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/correlation_invoke_props.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/correlation_invoke_props.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/correlation_invoke_props.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/correlation_props.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/correlation_props.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/correlation_props.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/correlation_props.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/for_props.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/for_props.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/for_props.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/for_props.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/new_input_variable.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/new_input_variable.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/new_input_variable.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/new_input_variable.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/pick_onmessage_props.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/pick_onmessage_props.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/pick_onmessage_props.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/pick_onmessage_props.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/project_soa_bpel_name_location.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/project_soa_bpel_name_location.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/project_soa_bpel_name_location.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/project_soa_bpel_name_location.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/repeat_every_props.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/repeat_every_props.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/repeat_every_props.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/repeat_every_props.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/throw_name_props.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/throw_name_props.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/throw_name_props.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/throw_name_props.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/until_props.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/until_props.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/until_props.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/properties/until_props.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/about.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/about.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/about.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/about.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/add_bpel_project.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/add_bpel_project.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/add_bpel_project.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/add_bpel_project.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/build_deploy.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/build_deploy.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/build_deploy.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/build_deploy.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/build_project.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/build_project.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/build_project.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/build_project.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/test_run.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/test_run.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/test_run.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/test_run/test_run.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/add_files.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/add_files.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/add_files.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/add_files.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/add_package.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/add_package.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/add_package.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/add_package.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/cloning.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/cloning.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/cloning.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/cloning.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_elements.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_elements.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_elements.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_elements.html @@ -1,6 +1,6 @@ @@ -65,7 +65,6 @@
About BPEL Elements
Changing Message Flows
Switching Between Design and Source Views
-
Refactoring in BPEL Processes
diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_navig.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_navig.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_navig.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_navig.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_print.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_print.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_print.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_print.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_src_switch.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_src_switch.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_src_switch.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_src_switch.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_view.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_view.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_view.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/design_view.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/edit_files.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/edit_files.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/edit_files.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/edit_files.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav_bpelview.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav_bpelview.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav_bpelview.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav_bpelview.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav_xml.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav_xml.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav_xml.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/nav_xml.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/populate_catalog.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/populate_catalog.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/populate_catalog.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/populate_catalog.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/project_node.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/project_node.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/project_node.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/project_node.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed_open_edits.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed_open_edits.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed_open_edits.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed_open_edits.html @@ -1,6 +1,6 @@ diff --git a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed_validate_bpel.html b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed_validate_bpel.html --- a/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed_validate_bpel.html +++ b/bpel.help/javahelp/org/netbeans/modules/bpel/help/windows_editors/source_ed_validate_bpel.html @@ -1,6 +1,6 @@ diff --git a/cnd.modelutil/src/org/netbeans/modules/cnd/modelutil/CsmUtilities.java b/cnd.modelutil/src/org/netbeans/modules/cnd/modelutil/CsmUtilities.java --- a/cnd.modelutil/src/org/netbeans/modules/cnd/modelutil/CsmUtilities.java +++ b/cnd.modelutil/src/org/netbeans/modules/cnd/modelutil/CsmUtilities.java @@ -326,6 +326,10 @@ LanguagePath path = LanguagePath.get(MimeLookup.getLookup(mimeType).lookup(Language.class)); FileObject fileObject = (FileObject) inputAttributes.getValue(path, "dialogBinding.fileObject"); //NOI18N csmFile = CsmUtilities.getCsmFile(fileObject, waitParsing); + if (csmFile == null) { + Document d = (Document) inputAttributes.getValue(path, "dialogBinding.document"); //NOI18N + csmFile = d == null ? null : CsmUtilities.getCsmFile(d, waitParsing); + } } } } diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/about.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/about.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/about.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/about.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/add_jbi_module.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/add_jbi_module.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/add_jbi_module.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/add_jbi_module.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/caps_project_basic_create.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/caps_project_basic_create.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/caps_project_basic_create.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/caps_project_basic_create.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/create_project.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/create_project.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/create_project.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/create_project.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/deploy_project.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/deploy_project.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/deploy_project.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/deploy_project.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/javaee-deployment-settings.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/javaee-deployment-settings.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/javaee-deployment-settings.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/javaee-deployment-settings.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/javaee-module-options.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/javaee-module-options.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/javaee-module-options.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/javaee-module-options.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_adding_test.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_adding_test.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_adding_test.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_adding_test.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_customizing_input.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_customizing_input.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_customizing_input.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_customizing_input.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_running_tester.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_running_tester.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_running_tester.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_running_tester.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_setting_props.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_setting_props.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_setting_props.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/jbi_tester_setting_props.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/verify-server-resources.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/verify-server-resources.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/verify-server-resources.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/basics/verify-server-resources.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/about-casa.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/about-casa.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/about-casa.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/about-casa.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/building.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/building.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/building.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/building.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/clean-configuration.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/clean-configuration.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/clean-configuration.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/clean-configuration.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/config-extension.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/config-extension.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/config-extension.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/config-extension.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/connections.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/connections.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/connections.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/connections.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/design-view.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/design-view.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/design-view.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/design-view.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/disable-endpoint.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/disable-endpoint.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/disable-endpoint.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/disable-endpoint.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/editing-binding.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/editing-binding.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/editing-binding.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/editing-binding.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/editing-service-units.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/editing-service-units.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/editing-service-units.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/editing-service-units.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/navigator.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/navigator.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/navigator.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/navigator.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/opening.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/opening.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/opening.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/casaeditor/opening.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/credits.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/credits.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/credits.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/credits.html @@ -1,6 +1,6 @@ @@ -14,7 +14,7 @@

You can obtain a copy of the License at http://www.netbeans.org/cddl.html or http://www.netbeans.org/cddl.txt.

When distributing Covered Code, include this CDDL Header Notice in each file and include the License file at http://www.netbeans.org/cddl.txt. If applicable, add the following below the CDDL Header, with the fields enclosed by brackets [] replaced by your own identifying information: "Portions Copyrighted [year] [name of copyright owner]"

The Original Software is NetBeans. The Initial Developer of the Original Software - is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun Microsystems, Inc. + is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems,, Inc. All Rights Reserved.

Note: Sun is not responsible for the availability of third-party web sites mentioned in this document and does not endorse and is not responsible or liable for any content, advertising, products, or other materials on or available from such sites or resources. Sun will not be responsible or liable for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods, or services available on or through any such sites or resources.

diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/intro.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/intro.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/intro.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/intro.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/app-configuration.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/app-configuration.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/app-configuration.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/app-configuration.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/app-variables.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/app-variables.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/app-variables.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/app-variables.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_BindingComponents.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_BindingComponents.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_BindingComponents.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_BindingComponents.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_RuntimeFunctionality.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_RuntimeFunctionality.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_RuntimeFunctionality.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_RuntimeFunctionality.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_ServiceAssemblies.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_ServiceAssemblies.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_ServiceAssemblies.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_ServiceAssemblies.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_ServiceEngines.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_ServiceEngines.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_ServiceEngines.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_ServiceEngines.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_SharedLibraries.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_SharedLibraries.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_SharedLibraries.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/caps_jbi_node_SharedLibraries.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/jbi_node_bc-properties.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/jbi_node_bc-properties.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/jbi_node_bc-properties.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/jbinode/jbi_node_bc-properties.html @@ -1,6 +1,6 @@ diff --git a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/properties/caps_project_props.html b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/properties/caps_project_props.html --- a/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/properties/caps_project_props.html +++ b/compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/properties/caps_project_props.html @@ -1,6 +1,6 @@ diff --git a/dbschema/javahelp/org/netbeans/modules/dbschema/docs/HelpSet.hs b/dbschema/javahelp/org/netbeans/modules/dbschema/docs/HelpSet.hs --- a/dbschema/javahelp/org/netbeans/modules/dbschema/docs/HelpSet.hs +++ b/dbschema/javahelp/org/netbeans/modules/dbschema/docs/HelpSet.hs @@ -3,7 +3,7 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,7 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun +Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding diff --git a/dbschema/javahelp/org/netbeans/modules/dbschema/docs/dbschema.html b/dbschema/javahelp/org/netbeans/modules/dbschema/docs/dbschema.html --- a/dbschema/javahelp/org/netbeans/modules/dbschema/docs/dbschema.html +++ b/dbschema/javahelp/org/netbeans/modules/dbschema/docs/dbschema.html @@ -1,7 +1,7 @@ diff --git a/dbschema/javahelp/org/netbeans/modules/dbschema/docs/dbschema_recapture.html b/dbschema/javahelp/org/netbeans/modules/dbschema/docs/dbschema_recapture.html --- a/dbschema/javahelp/org/netbeans/modules/dbschema/docs/dbschema_recapture.html +++ b/dbschema/javahelp/org/netbeans/modules/dbschema/docs/dbschema_recapture.html @@ -1,7 +1,7 @@ diff --git a/dbschema/javahelp/org/netbeans/modules/dbschema/docs/ide.css b/dbschema/javahelp/org/netbeans/modules/dbschema/docs/ide.css --- a/dbschema/javahelp/org/netbeans/modules/dbschema/docs/ide.css +++ b/dbschema/javahelp/org/netbeans/modules/dbschema/docs/ide.css @@ -2,7 +2,7 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common @@ -25,7 +25,7 @@ * Contributor(s): * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun * Microsystems, Inc. All Rights Reserved. * * If you wish your version of this file to be governed by only the CDDL diff --git a/dbschema/javahelp/org/netbeans/modules/dbschema/docs/toc.xml b/dbschema/javahelp/org/netbeans/modules/dbschema/docs/toc.xml --- a/dbschema/javahelp/org/netbeans/modules/dbschema/docs/toc.xml +++ b/dbschema/javahelp/org/netbeans/modules/dbschema/docs/toc.xml @@ -3,7 +3,7 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/about_am.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/about_am.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/about_am.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/about_am.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/accessing_am_console.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/accessing_am_console.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/accessing_am_console.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/accessing_am_console.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/changing_props_am_instance.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/changing_props_am_instance.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/changing_props_am_instance.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/changing_props_am_instance.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_am_sec_mech.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_am_sec_mech.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_am_sec_mech.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_am_sec_mech.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_liberty_customkeystore.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_liberty_customkeystore.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_liberty_customkeystore.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_liberty_customkeystore.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_support_libertysaml.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_support_libertysaml.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_support_libertysaml.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/config_support_libertysaml.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/removing_am_instance.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/removing_am_instance.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/removing_am_instance.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/removing_am_instance.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/ww_am_instances.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/ww_am_instances.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/ww_am_instances.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/am/ww_am_instances.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_liberty.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_liberty.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_liberty.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_liberty.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_saml.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_saml.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_saml.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_saml.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_usernamepw.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_usernamepw.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_usernamepw.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_usernamepw.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_x509.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_x509.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_x509.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/clients/wsc_enable_x509.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/credits.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/credits.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/credits.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems,, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems,, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_amserverinstance.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_amserverinstance.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_amserverinstance.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_amserverinstance.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_securingwebserviceclient.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_securingwebserviceclient.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_securingwebserviceclient.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_securingwebserviceclient.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_securingwebserviceprovider.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_securingwebserviceprovider.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_securingwebserviceprovider.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/csh/csh_securingwebserviceprovider.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/identity-javahelp-toc.xml b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/identity-javahelp-toc.xml --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/identity-javahelp-toc.xml +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/identity-javahelp-toc.xml @@ -1,7 +1,7 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_liberty.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_liberty.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_liberty.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_liberty.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_saml.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_saml.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_saml.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_saml.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_usernamepw.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_usernamepw.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_usernamepw.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_usernamepw.html @@ -1,6 +1,6 @@ diff --git a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_x509.html b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_x509.html --- a/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_x509.html +++ b/identity.profile.ui/javahelp/org/netbeans/modules/identity/profile/ui/providers/wsp_enable_x509.html @@ -1,6 +1,6 @@ diff --git a/installer/components/products/nb-base/src/org/netbeans/installer/products/nb/base/ConfigurationLogic.java b/installer/components/products/nb-base/src/org/netbeans/installer/products/nb/base/ConfigurationLogic.java --- a/installer/components/products/nb-base/src/org/netbeans/installer/products/nb/base/ConfigurationLogic.java +++ b/installer/components/products/nb-base/src/org/netbeans/installer/products/nb/base/ConfigurationLogic.java @@ -38,6 +38,7 @@ import java.io.File; import java.io.IOException; import java.util.List; +import java.util.Locale; import java.util.Map; import org.netbeans.installer.product.Registry; import org.netbeans.installer.product.components.ProductConfigurationLogic; @@ -47,6 +48,7 @@ import org.netbeans.installer.utils.FileProxy; import org.netbeans.installer.utils.FileUtils; import org.netbeans.installer.utils.LogManager; +import org.netbeans.installer.utils.ResourceUtils; import org.netbeans.installer.utils.StringUtils; import org.netbeans.installer.utils.SystemUtils; import org.netbeans.installer.utils.applications.JavaUtils; @@ -633,8 +635,8 @@ // private ////////////////////////////////////////////////////////////////////// private Shortcut getDesktopShortcut(final File directory) { return getShortcut( - getString("CL.desktop.shortcut.name"), // NOI18N - getString("CL.desktop.shortcut.description"), // NOI18N + getStrings("CL.desktop.shortcut.name"), // NOI18N + getStrings("CL.desktop.shortcut.description"), // NOI18N getString("CL.desktop.shortcut.path"), // NOI18N directory); } @@ -642,22 +644,22 @@ private Shortcut getStartMenuShortcut(final File directory) { if (SystemUtils.isMacOS()) { return getShortcut( - getString("CL.start.menu.shortcut.name.macosx"), // NOI18N - getString("CL.start.menu.shortcut.description"), // NOI18N + getStrings("CL.start.menu.shortcut.name.macosx"), // NOI18N + getStrings("CL.start.menu.shortcut.description"), // NOI18N getString("CL.start.menu.shortcut.path"), // NOI18N directory); } else { return getShortcut( - getString("CL.start.menu.shortcut.name"), // NOI18N - getString("CL.start.menu.shortcut.description"), // NOI18N + getStrings("CL.start.menu.shortcut.name"), // NOI18N + getStrings("CL.start.menu.shortcut.description"), // NOI18N getString("CL.start.menu.shortcut.path"), // NOI18N directory); } } private Shortcut getShortcut( - final String name, - final String description, + final Map names, + final Map descriptions, final String relativePath, final File location) { final File icon; @@ -676,10 +678,10 @@ } else { executable = new File(location, EXECUTABLE_UNIX); } - + final String name = names.get(new Locale(StringUtils.EMPTY_STRING)); final FileShortcut shortcut = new FileShortcut(name, executable); - - shortcut.setDescription(description); + shortcut.setNames(names); + shortcut.setDescriptions(descriptions); shortcut.setCategories(SHORTCUT_CATEGORIES); shortcut.setFileName(SHORTCUT_FILENAME); shortcut.setIcon(icon); diff --git a/installer/infra/build/build.xml b/installer/infra/build/build.xml --- a/installer/infra/build/build.xml +++ b/installer/infra/build/build.xml @@ -793,7 +793,7 @@ - + @@ -1385,7 +1385,7 @@ - + @@ -1408,7 +1408,7 @@ - + @@ -1433,7 +1433,7 @@ - + diff --git a/installer/infra/build/web/bundles.list b/installer/infra/build/web/bundles.list --- a/installer/infra/build/web/bundles.list +++ b/installer/infra/build/web/bundles.list @@ -4,6 +4,6 @@ ruby=nb-base, nb-webcommon, nb-ruby, glassfish-mod-sun cpp=nb-base, nb-cnd php=nb-base, nb-webcommon, nb-php -all=nb-base, nb-webcommon, nb-javase, nb-javaee, nb-javame, nb-cnd, nb-ruby, nb-groovy, nb-php, nb-ergonomics, sjsas, glassfish-mod-sun, openesb, tomcat -hidden=openesb, nb-base, nb-webcommon, nb-ergonomics +all=nb-base, nb-webcommon, nb-javase, nb-javaee, nb-javame, nb-cnd, nb-ruby, nb-groovy, nb-php, nb-ergonomics, sjsas, glassfish-mod-sun, tomcat +hidden=nb-base, nb-webcommon, nb-ergonomics diff --git a/installer/infra/build/web/js/build_info.js b/installer/infra/build/web/js/build_info.js --- a/installer/infra/build/web/js/build_info.js +++ b/installer/infra/build/web/js/build_info.js @@ -45,7 +45,7 @@ build_info.BOUNCER_PRODUCT_PREFIX = "{nb.bundle.files.prefix}"; build_info.COMMUNITY_BUILD = "{community.mlbuild}"; -build_info.SHOW_ADDITIONAL_LANGUAGES = "{enable.languages.redirect}"; +build_info.SHOW_ADDITIONAL_LANGUAGES = 0;//"{enable.languages.redirect}"; build_info.ADDITIONAL_BUILD_LOCATION = "{alternative.languages.page.url}"; diff --git a/installer/infra/build/web/js/start.js b/installer/infra/build/web/js/start.js --- a/installer/infra/build/web/js/start.js +++ b/installer/infra/build/web/js/start.js @@ -163,7 +163,7 @@ } } } - if(lang_id=="") lang_id = "en"; + if(lang_id=="") lang_id = get_language_id(); if(option_id != "" && platform_id != "") { if (useBouncer(lang_id) == 1) { diff --git a/installer/mac/newbuild/build.xml b/installer/mac/newbuild/build.xml --- a/installer/mac/newbuild/build.xml +++ b/installer/mac/newbuild/build.xml @@ -66,7 +66,7 @@ - + @@ -214,7 +214,7 @@ - + - + diff --git a/installer/mac/newbuild/dmg/distribution.dist b/installer/mac/newbuild/dmg/distribution.dist --- a/installer/mac/newbuild/dmg/distribution.dist +++ b/installer/mac/newbuild/dmg/distribution.dist @@ -121,7 +121,7 @@ - + @@ -132,9 +132,11 @@ + @@ -167,7 +169,7 @@ file:./Contents/Packages/sjsas.pkg file:./Contents/Packages/glassfish-v3-sun.pkg file:./Contents/Packages/tomcat.pkg - file:./Contents/Packages/openesb.pkg + file:./Contents/Packages/baseide.pkg file:./Contents/Packages/javase.pkg file:./Contents/Packages/webcommon.pkg diff --git a/installer/mac/newbuild/glassfish/pkg/scripts/postflight b/installer/mac/newbuild/glassfish/pkg/scripts/postflight --- a/installer/mac/newbuild/glassfish/pkg/scripts/postflight +++ b/installer/mac/newbuild/glassfish/pkg/scripts/postflight @@ -66,6 +66,7 @@ https_port=`getPort 8181` host_name=`getHost` + export JAVA_HOME $ant_bin --noconfig -v -f setup.xml -Dinstall.home="$2" -Dsource="$SERVICE_TAG_SOURCE" -Dadmin.port=$admin_port -Dinstance.port=$instance_port -Dorb.port=$orb_port -Dimq.port=$imq_port -Dhttps.port=$https_port #TODO replase admin.host=localhost to admin.host=$host_name in ./samples/common.properties file diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_about.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_about.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_about.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_about.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_create.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_create.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_create.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_create.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_edit_dd.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_edit_dd.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_edit_dd.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_edit_dd.html @@ -1,7 +1,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_process.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_process.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_process.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_process.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_quickref.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_quickref.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_quickref.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/appclient_quickref.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_compiling.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_compiling.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_compiling.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_compiling.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_documenting.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_documenting.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_documenting.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_documenting.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_libraries.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_libraries.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_libraries.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_libraries.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_packaging.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_packaging.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_packaging.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_packaging.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_run.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_run.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_run.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_run.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_sources.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_sources.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_sources.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_sources.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_wsclient.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_wsclient.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_wsclient.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_wsclient.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_wsclient_disabled.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_wsclient_disabled.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_wsclient_disabled.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_props_wsclient_disabled.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_with_source_wizard1.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_with_source_wizard1.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_with_source_wizard1.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_with_source_wizard1.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_with_source_wizard2.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_with_source_wizard2.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_with_source_wizard2.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/appclient_with_source_wizard2.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/new_appclient.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/new_appclient.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/new_appclient.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/new_appclient.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/new_appclient_server.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/new_appclient_server.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/new_appclient_server.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/appclient/csh/new_appclient_server.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/archiveproject-deploying.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/archiveproject-deploying.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/archiveproject-deploying.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/archiveproject-deploying.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/archiveproject_about.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/archiveproject_about.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/archiveproject_about.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/archiveproject_about.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/csh/archiveproject-properties-run.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/csh/archiveproject-properties-run.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/csh/archiveproject-properties-run.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/csh/archiveproject-properties-run.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/csh/archiveproject_new_wizard.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/csh/archiveproject_new_wizard.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/csh/archiveproject_new_wizard.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/archiveproject/csh/archiveproject_new_wizard.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/credits.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/credits.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/credits.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/about_ejb_relationship.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/about_ejb_relationship.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/about_ejb_relationship.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/about_ejb_relationship.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/config_ejb_about.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/config_ejb_about.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/config_ejb_about.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/config_ejb_about.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/config_ejb_dd.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/config_ejb_dd.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/config_ejb_dd.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/config_ejb_dd.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/ejb_relationship.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/ejb_relationship.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/ejb_relationship.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/configuring/ejb_relationship.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/call_ejb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/call_ejb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/call_ejb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/call_ejb.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_generate_cmp1.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_generate_cmp1.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_generate_cmp1.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_generate_cmp1.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_generate_cmp2.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_generate_cmp2.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_generate_cmp2.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_generate_cmp2.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_entity.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_entity.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_entity.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_entity.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb_destination.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb_destination.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb_destination.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb_destination.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb_ee5.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb_ee5.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb_ee5.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_mdb_ee5.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_session.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_session.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_session.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_session.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_wizard.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_wizard.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_wizard.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_wizard.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_wizard_server.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_wizard_server.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_wizard_server.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_new_wizard_server.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_with_source_wizard1.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_with_source_wizard1.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_with_source_wizard1.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_with_source_wizard1.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_with_source_wizard2.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_with_source_wizard2.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_with_source_wizard2.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/ejb_with_source_wizard2.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Entity.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Entity.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Entity.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Entity.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_MDB.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_MDB.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_MDB.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_MDB.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Relationship.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Relationship.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Relationship.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Relationship.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Session.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Session.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Session.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_Session.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanDetails.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanDetails.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanDetails.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanDetails.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanEnviornment.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanEnviornment.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanEnviornment.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanEnviornment.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanImp.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanImp.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanImp.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanImp.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanSecurity.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanSecurity.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanSecurity.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_beanSecurity.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_moduleDetails.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_moduleDetails.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_moduleDetails.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_moduleDetails.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_securityRoles.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_securityRoles.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_securityRoles.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/graphic_editor/dd_multiview_securityRoles.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-add-library.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-add-library.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-add-library.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-add-library.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-compile.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-compile.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-compile.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-compile.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-javadoc.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-javadoc.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-javadoc.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-javadoc.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-libraries.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-libraries.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-libraries.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-libraries.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-packaging.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-packaging.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-packaging.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-packaging.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-run.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-run.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-run.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-run.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-sources.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-sources.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-sources.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-sources.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-webservices-disabled.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-webservices-disabled.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-webservices-disabled.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-webservices-disabled.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-webservices.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-webservices.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-webservices.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/csh/stand-ejb-properties-webservices.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/debug_ejb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/debug_ejb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/debug_ejb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/debug_ejb.html @@ -1,7 +1,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/profile_ejb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/profile_ejb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/profile_ejb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/profile_ejb.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/test_ejb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/test_ejb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/test_ejb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/debug/test_ejb.html @@ -1,7 +1,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/deploy/build_ejb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/deploy/build_ejb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/deploy/build_ejb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/deploy/build_ejb.html @@ -1,7 +1,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/deploy/deploy_ejb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/deploy/deploy_ejb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/deploy/deploy_ejb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/deploy/deploy_ejb.html @@ -1,7 +1,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/about_business_method.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/about_business_method.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/about_business_method.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/about_business_method.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/about_call_ejb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/about_call_ejb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/about_call_ejb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/about_call_ejb.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/add_ejbql.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/add_ejbql.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/add_ejbql.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/add_ejbql.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/call_ejb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/call_ejb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/call_ejb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/call_ejb.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/create_ejb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/create_ejb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/create_ejb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/create_ejb.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/create_ejb_project.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/create_ejb_project.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/create_ejb_project.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/create_ejb_project.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_business_method.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_business_method.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_business_method.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_business_method.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_cmp_field.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_cmp_field.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_cmp_field.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_cmp_field.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_finder_method.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_finder_method.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_finder_method.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_finder_method.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_select_method.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_select_method.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_select_method.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/define_select_method.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/generate_cmp_beans.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/generate_cmp_beans.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/generate_cmp_beans.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/generate_cmp_beans.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/refactor_ejb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/refactor_ejb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/refactor_ejb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/editing/refactor_ejb.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_cmp.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_cmp.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_cmp.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_cmp.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_deployment_descriptors.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_deployment_descriptors.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_deployment_descriptors.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_deployment_descriptors.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_ejbs.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_ejbs.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_ejbs.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_ejbs.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_entity_beans.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_entity_beans.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_entity_beans.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_entity_beans.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_msg_driven_beans.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_msg_driven_beans.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_msg_driven_beans.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_msg_driven_beans.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_session_beans.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_session_beans.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_session_beans.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/about_session_beans.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/ejb_process.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/ejb_process.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/ejb_process.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/ejb_process.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/ejb_quickref.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/ejb_quickref.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/ejb_quickref.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/ejb_quickref.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/entity_quickref.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/entity_quickref.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/entity_quickref.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/general/entity_quickref.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschemadef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschemadef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschemadef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschemadef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschemanamedef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschemanamedef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschemanamedef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschemanamedef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschematypedef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschematypedef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschematypedef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/abstractschematypedef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/deploymentdesc.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/deploymentdesc.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/deploymentdesc.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/deploymentdesc.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/eisdef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/eisdef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/eisdef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/eisdef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejbcntnrdef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejbcntnrdef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejbcntnrdef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejbcntnrdef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejblocalrefdef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejblocalrefdef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejblocalrefdef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejblocalrefdef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejbrefdef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejbrefdef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejbrefdef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/ejbrefdef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/enventrydef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/enventrydef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/enventrydef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/enventrydef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/j2eeappdef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/j2eeappdef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/j2eeappdef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/j2eeappdef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/j2eesrvdef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/j2eesrvdef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/j2eesrvdef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/j2eesrvdef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/jarfiledef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/jarfiledef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/jarfiledef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/jarfiledef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/navigationdef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/navigationdef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/navigationdef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/navigationdef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/persistentfielddef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/persistentfielddef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/persistentfielddef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/persistentfielddef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/primarykeyfield.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/primarykeyfield.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/primarykeyfield.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/primarykeyfield.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/relationshipfielddef.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/relationshipfielddef.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/relationshipfielddef.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/relationshipfielddef.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/resourceenvironmentref.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/resourceenvironmentref.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/resourceenvironmentref.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/resourceenvironmentref.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/resourcefactoryref.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/resourcefactoryref.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/resourcefactoryref.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/resourcefactoryref.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/securityroleref.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/securityroleref.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/securityroleref.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/ejb/glossary/securityroleref.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerGeneral.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerGeneral.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerGeneral.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerGeneral.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerJarContent.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerJarContent.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerJarContent.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerJarContent.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerLibraries.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerLibraries.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerLibraries.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerLibraries.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerRun.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerRun.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerRun.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/CustomizerRun.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator2.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator2.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator2.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator2.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator_servers.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator_servers.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator_servers.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/ImportBlueprintEarWizardIterator_servers.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/NewEarProjectWizardIterator.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/NewEarProjectWizardIterator.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/NewEarProjectWizardIterator.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/NewEarProjectWizardIterator.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/NewEarProjectWizardIterator_servers.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/NewEarProjectWizardIterator_servers.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/NewEarProjectWizardIterator_servers.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/NewEarProjectWizardIterator_servers.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/send_email.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/send_email.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/send_email.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/send_email.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/send_jms.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/send_jms.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/send_jms.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/send_jms.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/use_db.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/use_db.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/use_db.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/csh/use_db.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/about_ent_apps.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/about_ent_apps.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/about_ent_apps.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/about_ent_apps.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/add_modules_to_ent_app.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/add_modules_to_ent_app.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/add_modules_to_ent_app.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/add_modules_to_ent_app.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/add_resources_to_ent_app.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/add_resources_to_ent_app.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/add_resources_to_ent_app.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/add_resources_to_ent_app.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_build.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_build.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_build.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_build.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_configure.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_configure.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_configure.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_configure.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_creating.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_creating.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_creating.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_creating.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_deploy.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_deploy.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_deploy.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_deploy.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_process.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_process.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_process.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_process.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_quickref.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_quickref.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_quickref.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_quickref.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_verify.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_verify.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_verify.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/ent_app_verify.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/send_email.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/send_email.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/send_email.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/send_email.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/send_jms.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/send_jms.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/send_jms.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/send_jms.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/service_locator.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/service_locator.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/service_locator.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/service_locator.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/use_db.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/use_db.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/use_db.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/enterprise/general/use_db.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/j2ee-toc.xml b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/j2ee-toc.xml --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/j2ee-toc.xml +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/j2ee-toc.xml @@ -1,7 +1,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/j2ee.hs b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/j2ee.hs --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/j2ee.hs +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/j2ee.hs @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/csh/persist_new_sessionfromentity1.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/csh/persist_new_sessionfromentity1.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/csh/persist_new_sessionfromentity1.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/csh/persist_new_sessionfromentity1.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/csh/persist_new_sessionfromentity2.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/csh/persist_new_sessionfromentity2.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/csh/persist_new_sessionfromentity2.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/csh/persist_new_sessionfromentity2.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/general/persistence_sessionfromentity.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/general/persistence_sessionfromentity.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/general/persistence_sessionfromentity.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/general/persistence_sessionfromentity.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/general/persistence_webapp.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/general/persistence_webapp.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/general/persistence_webapp.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/persistence/general/persistence_webapp.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/about_server.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/about_server.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/about_server.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/about_server.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/csh_server_manager.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/csh_server_manager.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/csh_server_manager.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/csh_server_manager.html @@ -1,7 +1,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/about_jboss.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/about_jboss.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/about_jboss.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/about_jboss.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/datasource_app_server_jboss.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/datasource_app_server_jboss.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/datasource_app_server_jboss.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/datasource_app_server_jboss.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_location_csh.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_location_csh.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_location_csh.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_location_csh.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_process.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_process.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_process.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_process.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_properties_csh.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_properties_csh.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_properties_csh.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_properties_csh.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_quickref.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_quickref.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_quickref.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/jboss_quickref.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/management_console_app_server_jboss.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/management_console_app_server_jboss.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/management_console_app_server_jboss.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/management_console_app_server_jboss.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/registering_app_server_jboss.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/registering_app_server_jboss.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/registering_app_server_jboss.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/jboss/registering_app_server_jboss.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_aboutdbconnect.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_aboutdbconnect.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_aboutdbconnect.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_aboutdbconnect.html @@ -3,7 +3,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_register.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_register.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_register.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_register.html @@ -1,7 +1,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_remove.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_remove.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_remove.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_remove.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_start.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_start.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_start.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/server_start.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/weblogic/weblogic_location_csh.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/weblogic/weblogic_location_csh.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/weblogic/weblogic_location_csh.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/weblogic/weblogic_location_csh.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/weblogic/weblogic_properties_csh.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/weblogic/weblogic_properties_csh.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/weblogic/weblogic_properties_csh.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/server/weblogic/weblogic_properties_csh.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/tbd.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/tbd.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/tbd.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/tbd.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/web/about_webtier.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/web/about_webtier.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/web/about_webtier.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/web/about_webtier.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/about_rest.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/about_rest.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/about_rest.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/about_rest.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/about_ws.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/about_ws.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/about_ws.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/about_ws.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/ws_process.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/ws_process.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/ws_process.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/ws_process.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/ws_quickref.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/ws_quickref.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/ws_quickref.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/about/ws_quickref.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/build/about_build_ws.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/build/about_build_ws.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/build/about_build_ws.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/build/about_build_ws.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/about_annotations.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/about_annotations.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/about_annotations.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/about_annotations.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_about.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_about.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_about.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_about.html @@ -2,7 +2,7 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_annotations.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_annotations.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_annotations.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_annotations.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_dd.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_dd.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_dd.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/configure/config_ws_dd.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/about_wsc.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/about_wsc.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/about_wsc.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/about_wsc.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_build.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_build.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_build.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_build.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_call_ws.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_call_ws.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_call_ws.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_call_ws.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_call_ws_asynchronous.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_call_ws_asynchronous.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_call_ws_asynchronous.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_call_ws_asynchronous.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_create.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_create.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_create.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_create.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_deploy.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_deploy.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_deploy.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_deploy.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_expose.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_expose.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_expose.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_expose.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_process.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_process.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_process.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_process.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_proxy.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_proxy.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_proxy.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_proxy.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_rest.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_rest.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_rest.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_rest.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_stubs.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_stubs.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_stubs.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/consume/wsc_stubs.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/about_implement_ws.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/about_implement_ws.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/about_implement_ws.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/about_implement_ws.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/add_ws_operation.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/add_ws_operation.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/add_ws_operation.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/add_ws_operation.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_axis.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_axis.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_axis.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_axis.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_rest_from_scratch.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_rest_from_scratch.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_rest_from_scratch.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_rest_from_scratch.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_java.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_java.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_java.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_java.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_scratch.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_scratch.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_scratch.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_scratch.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_wsdl.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_wsdl.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_wsdl.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_ws_from_wsdl.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_wsdl_file.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_wsdl_file.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_wsdl_file.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/create/create_wsdl_file.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/AddWebServiceDlg.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/AddWebServiceDlg.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/AddWebServiceDlg.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/AddWebServiceDlg.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/EditWSAttributesCookieImpl.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/EditWSAttributesCookieImpl.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/EditWSAttributesCookieImpl.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/EditWSAttributesCookieImpl.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_BINDING.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_BINDING.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_BINDING.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_BINDING.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_BINDING_OPERATION.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_BINDING_OPERATION.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_BINDING_OPERATION.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_BINDING_OPERATION.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_EXTERNAL_BINDING.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_EXTERNAL_BINDING.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_EXTERNAL_BINDING.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_EXTERNAL_BINDING.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_GLOBAL.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_GLOBAL.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_GLOBAL.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_GLOBAL.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT_TYPE.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT_TYPE.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT_TYPE.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT_TYPE.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT_TYPE_OPERATION_FAULT.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT_TYPE_OPERATION_FAULT.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT_TYPE_OPERATION_FAULT.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_PORT_TYPE_OPERATION_FAULT.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_SERVICE.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_SERVICE.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_SERVICE.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/ID_SERVICE.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/wsdl_customization.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/wsdl_customization.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/wsdl_customization.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/editor/wsdl_customization.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/LogicalHandlerWizard.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/LogicalHandlerWizard.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/LogicalHandlerWizard.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/LogicalHandlerWizard.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/MessageHandlerWizard.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/MessageHandlerWizard.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/MessageHandlerWizard.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/MessageHandlerWizard.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceClientWizardDescriptor.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceClientWizardDescriptor.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceClientWizardDescriptor.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceClientWizardDescriptor.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceWizardDescriptor.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceWizardDescriptor.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceWizardDescriptor.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceWizardDescriptor.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceWizardFromWSDLDescriptor.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceWizardFromWSDLDescriptor.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceWizardFromWSDLDescriptor.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WebServiceWizardFromWSDLDescriptor.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WsdlPanel.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WsdlPanel.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WsdlPanel.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/csh/wizards/WsdlPanel.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/about_deploy_and_test_ws.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/about_deploy_and_test_ws.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/about_deploy_and_test_ws.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/about_deploy_and_test_ws.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/as_setup_axis.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/as_setup_axis.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/as_setup_axis.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/as_setup_axis.html @@ -1,4 +1,4 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/deploy_axis.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/deploy_axis.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/deploy_axis.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/deploy_axis.html @@ -1,4 +1,4 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/deploy_test_axis.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/deploy_test_axis.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/deploy_test_axis.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/deploy_test_axis.html @@ -1,4 +1,4 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/expose_ws.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/expose_ws.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/expose_ws.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/expose_ws.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/glassfish_tester-ws.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/glassfish_tester-ws.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/glassfish_tester-ws.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/glassfish_tester-ws.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_axis.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_axis.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_axis.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_axis.html @@ -1,4 +1,4 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_rest.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_rest.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_rest.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_rest.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_ws.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_ws.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_ws.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/expose/test_ws.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/about_jaxb.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/about_jaxb.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/about_jaxb.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/about_jaxb.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/jaxb_wizard.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/jaxb_wizard.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/jaxb_wizard.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/jaxb_wizard.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/marshall_unmarshall.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/marshall_unmarshall.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/marshall_unmarshall.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/marshall_unmarshall.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/unmarshall_marshall.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/unmarshall_marshall.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/unmarshall_marshall.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/jaxb/unmarshall_marshall.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/about_ws_soap_message.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/about_ws_soap_message.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/about_ws_soap_message.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/about_ws_soap_message.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/configure_ws_soap_message.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/configure_ws_soap_message.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/configure_ws_soap_message.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/configure_ws_soap_message.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/create_ws_soap_message.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/create_ws_soap_message.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/create_ws_soap_message.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/create_ws_soap_message.html @@ -1,5 +1,5 @@ - diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/test_and_use_ws_soap_message.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/test_and_use_ws_soap_message.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/test_and_use_ws_soap_message.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/message/test_and_use_ws_soap_message.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-BindingInputNode.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-BindingInputNode.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-BindingInputNode.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-BindingInputNode.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-BindingOutputNode.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-BindingOutputNode.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-BindingOutputNode.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-BindingOutputNode.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-EditWSAttributesCookieImpl.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-EditWSAttributesCookieImpl.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-EditWSAttributesCookieImpl.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-EditWSAttributesCookieImpl.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-OperationContainerServiceNode.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-OperationContainerServiceNode.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-OperationContainerServiceNode.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-OperationContainerServiceNode.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-OperationNode.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-OperationNode.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-OperationNode.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-OperationNode.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-ServiceNode.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-ServiceNode.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-ServiceNode.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-ServiceNode.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-TransportClientNode.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-TransportClientNode.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-TransportClientNode.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-TransportClientNode.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-UserAuthenticationNode.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-UserAuthenticationNode.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-UserAuthenticationNode.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-UserAuthenticationNode.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-about.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-about.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-about.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-about.html @@ -1,6 +1,6 @@ diff --git a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-access.html b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-access.html --- a/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-access.html +++ b/j2ee.platform/javahelp/org/netbeans/modules/j2ee/platform/docs/webservice/nodes/wsitconf-access.html @@ -1,6 +1,6 @@ diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appclientconfigeditors/sun-application-client.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appclientconfigeditors/sun-application-client.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appclientconfigeditors/sun-application-client.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appclientconfigeditors/sun-application-client.html @@ -3,7 +3,7 @@ sun-application-client.xml Visual Editor: General diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appclientconfigeditors/sun-applicationclient_env.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appclientconfigeditors/sun-applicationclient_env.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appclientconfigeditors/sun-applicationclient_env.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appclientconfigeditors/sun-applicationclient_env.html @@ -3,7 +3,7 @@ Deployment Descriptor Visual Editor: Environment diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appconfigeditors/sunapplication.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appconfigeditors/sunapplication.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appconfigeditors/sunapplication.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/appconfigeditors/sunapplication.html @@ -3,7 +3,7 @@ sun-application.xml Visual Editor diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/gen_tables.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/gen_tables.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/gen_tables.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/gen_tables.html @@ -2,7 +2,7 @@ diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/map_bean_to_db.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/map_bean_to_db.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/map_bean_to_db.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/map_bean_to_db.html @@ -2,7 +2,7 @@ diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/map_rel_fields.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/map_rel_fields.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/map_rel_fields.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/cmp/map_rel_fields.html @@ -2,7 +2,7 @@ diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/ChangeDocType.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/ChangeDocType.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/ChangeDocType.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/ChangeDocType.html @@ -3,7 +3,7 @@ Change Configuration Version Dialog Box diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebAddGroup.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebAddGroup.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebAddGroup.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebAddGroup.html @@ -3,7 +3,7 @@ Visual Editor: Add Group Dialog Box diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebAddPrincipal.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebAddPrincipal.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebAddPrincipal.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebAddPrincipal.html @@ -3,7 +3,7 @@ Visual Editor: Add Principal Dialog Box diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebEditGroup.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebEditGroup.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebEditGroup.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebEditGroup.html @@ -3,7 +3,7 @@ Visual Editor: Edit Group Dialog Box diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebEditPrincipal.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebEditPrincipal.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebEditPrincipal.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebEditPrincipal.html @@ -3,7 +3,7 @@ Visual Editor: Edit Principal Dialog Box diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebMessageSecBindings.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebMessageSecBindings.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebMessageSecBindings.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebMessageSecBindings.html @@ -3,7 +3,7 @@ Visual Editor: Message Security Bindings Dialog Box diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebMessageSecurity.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebMessageSecurity.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebMessageSecurity.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebMessageSecurity.html @@ -3,7 +3,7 @@ Visual Editor: Message Security Dialog Box diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebRoleMapping.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebRoleMapping.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebRoleMapping.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/SecurityWebRoleMapping.html @@ -3,7 +3,7 @@ Deployment Descriptor Visual Editor: Security diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/ServiceRefPortInfoStubProperty.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/ServiceRefPortInfoStubProperty.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/ServiceRefPortInfoStubProperty.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/ServiceRefPortInfoStubProperty.html @@ -3,7 +3,7 @@ Service Reference Port Information: Stub Property Editor diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/Servlet.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/Servlet.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/Servlet.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/Servlet.html @@ -3,7 +3,7 @@ Deployment Descriptor Visual Editor: Servlets diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebAppGeneral.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebAppGeneral.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebAppGeneral.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebAppGeneral.html @@ -5,7 +5,7 @@ Deployment Descriptor Visual Editor: Messaging diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebserviceClients.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebserviceClients.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebserviceClients.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebserviceClients.html @@ -3,7 +3,7 @@ Deployment Descriptor Visual Editor: Web Service Clients diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebserviceDescriptor.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebserviceDescriptor.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebserviceDescriptor.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/configeditors/WebserviceDescriptor.html @@ -3,7 +3,7 @@ Deployment Descriptor Visual Editor: Web Services diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/credits.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/credits.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/credits.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/ejbconfigeditors/entitybean.html b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/ejbconfigeditors/entitybean.html --- a/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/ejbconfigeditors/entitybean.html +++ b/j2ee.sun.appsrv81/javahelp/org/netbeans/modules/j2ee/sun/ide/docs/ejbconfigeditors/entitybean.html @@ -7,7 +7,7 @@ diff --git a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/credits.html b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/credits.html --- a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/credits.html +++ b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-idx.xml b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-idx.xml --- a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-idx.xml +++ b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-idx.xml @@ -1,6 +1,6 @@ diff --git a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-map.jhm b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-map.jhm --- a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-map.jhm +++ b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-map.jhm @@ -2,7 +2,7 @@ diff --git a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-toc.xml b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-toc.xml --- a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-toc.xml +++ b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere-javahelp-toc.xml @@ -2,7 +2,7 @@ diff --git a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere_property_sheet_server_node.html b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere_property_sheet_server_node.html --- a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere_property_sheet_server_node.html +++ b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere_property_sheet_server_node.html @@ -1,6 +1,6 @@ diff --git a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere_registering_app_server.html b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere_registering_app_server.html --- a/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere_registering_app_server.html +++ b/j2ee.websphere6/javahelp/org/netbeans/modules/j2ee/websphere6/docs/websphere_registering_app_server.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_debugging.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_debugging.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_debugging.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_debugging.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_docs.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_docs.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_docs.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_docs.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_editing.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_editing.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_editing.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_editing.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_intro.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_intro.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_intro.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_intro.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_optional-tasks.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_optional-tasks.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_optional-tasks.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_optional-tasks.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_running.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_running.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_running.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_running.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_settings.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_settings.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_settings.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_settings.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_shortcut.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_shortcut.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_shortcut.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_shortcut.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_tasks-classpath.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_tasks-classpath.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_tasks-classpath.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_tasks-classpath.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_version.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_version.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_version.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_version.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/exp-classpath.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/exp-classpath.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/exp-classpath.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/exp-classpath.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_dependencies.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_dependencies.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_dependencies.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_dependencies.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_file.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_file.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_file.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_file.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_jar.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_jar.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_jar.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_jar.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_libraries.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_libraries.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_libraries.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_libraries.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_output.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_output.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_output.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_output.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_quickref.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_quickref.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_quickref.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/compile/comp_quickref.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/configure/options_ant.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/configure/options_ant.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/configure/options_ant.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/configure/options_ant.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/configure/options_form.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/configure/options_form.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/configure/options_form.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/configure/options_form.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/credits.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/credits.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/credits.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_class.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_class.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_class.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_class.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_exception.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_exception.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_exception.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_exception.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_line.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_line.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_line.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_line.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_method.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_method.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_method.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_method.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_thread.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_thread.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_thread.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_thread.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_variable.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_variable.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_variable.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_variable.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_view.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_view.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_view.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_view.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_window.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_window.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_window.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/breakpoint_window.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/callstack_view.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/callstack_view.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/callstack_view.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/callstack_view.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/classes_view.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/classes_view.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/classes_view.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/classes_view.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_options.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_options.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_options.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_options.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_output.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_output.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_output.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_output.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_window.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_window.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_window.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/debug_window.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/evaluate_expression.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/evaluate_expression.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/evaluate_expression.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/evaluate_expression.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/instances_view.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/instances_view.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/instances_view.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/instances_view.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/old_stack_call.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/old_stack_call.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/old_stack_call.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/old_stack_call.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/sessions_view.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/sessions_view.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/sessions_view.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/sessions_view.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/sources_view.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/sources_view.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/sources_view.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/sources_view.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/threads_view.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/threads_view.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/threads_view.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/threads_view.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/variables_view.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/variables_view.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/variables_view.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/variables_view.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/watch_window.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/watch_window.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/watch_window.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/watch_window.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/watches_view.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/watches_view.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/watches_view.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/CSH/watches_view.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_conditional.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_conditional.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_conditional.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_conditional.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_group.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_group.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_group.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_group.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_setting.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_setting.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_setting.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/breakpoint_setting.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_callstack.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_callstack.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_callstack.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_callstack.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_context.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_context.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_context.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_context.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_customize_views.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_customize_views.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_customize_views.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_customize_views.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_debuggingwindow.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_debuggingwindow.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_debuggingwindow.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_debuggingwindow.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_expression.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_expression.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_expression.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_expression.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_expressionstep.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_expressionstep.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_expressionstep.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_expressionstep.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_finish.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_finish.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_finish.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_finish.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_fix.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_fix.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_fix.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_fix.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_fix_watch.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_fix_watch.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_fix_watch.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_fix_watch.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_local.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_local.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_local.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_local.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_new_watch.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_new_watch.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_new_watch.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_new_watch.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_print_breakpoint_message.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_print_breakpoint_message.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_print_breakpoint_message.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_print_breakpoint_message.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_process.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_process.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_process.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_process.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_quickref.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_quickref.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_quickref.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_quickref.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_remote.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_remote.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_remote.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_remote.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_source.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_source.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_source.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_source.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_step.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_step.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_step.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_step.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_syntaxrules_breakpointconditions.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_syntaxrules_breakpointconditions.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_syntaxrules_breakpointconditions.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_syntaxrules_breakpointconditions.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_threads.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_threads.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_threads.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_threads.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_variables.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_variables.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_variables.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/debug/debug_variables.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/abbreviations-list.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/abbreviations-list.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/abbreviations-list.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/abbreviations-list.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/about_source_editor.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/about_source_editor.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/about_source_editor.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/about_source_editor.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/editor_glyphs.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/editor_glyphs.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/editor_glyphs.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/editor_glyphs.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/import_class_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/import_class_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/import_class_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/import_class_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/java_editor_toolbar.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/java_editor_toolbar.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/java_editor_toolbar.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/java_editor_toolbar.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/nav_window.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/nav_window.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/nav_window.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/csh/nav_window.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/editor_navigation.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/editor_navigation.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/editor_navigation.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/editor_navigation.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/editor_template_syntax.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/editor_template_syntax.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/editor_template_syntax.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/editor_template_syntax.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/java-editorcuts.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/java-editorcuts.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/java-editorcuts.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/java-editorcuts.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/tasks_viewing.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/tasks_viewing.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/tasks_viewing.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/editing/tasks_viewing.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_edit.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_edit.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_edit.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_edit.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_enable.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_enable.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_enable.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_enable.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_intro.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_intro.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_intro.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/groovy/groovy_intro.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_advanced_sourcemod_dialog.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_advanced_sourcemod_dialog.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_advanced_sourcemod_dialog.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_advanced_sourcemod_dialog.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_bind_advanced_dialog.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_bind_advanced_dialog.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_bind_advanced_dialog.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_bind_advanced_dialog.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_bind_dialog.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_bind_dialog.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_bind_dialog.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_bind_dialog.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_connection_wizard.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_connection_wizard.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_connection_wizard.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_connection_wizard.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_customizecode_dialog.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_customizecode_dialog.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_customizecode_dialog.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_customizecode_dialog.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_event_handler_dialog.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_event_handler_dialog.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_event_handler_dialog.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_event_handler_dialog.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_gridbag_customizer.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_gridbag_customizer.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_gridbag_customizer.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_gridbag_customizer.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_guibuilder_window.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_guibuilder_window.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_guibuilder_window.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_guibuilder_window.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_inspector_window.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_inspector_window.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_inspector_window.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_inspector_window.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_modifiers_editor.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_modifiers_editor.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_modifiers_editor.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_modifiers_editor.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_palette_window.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_palette_window.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_palette_window.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_palette_window.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_preview_window.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_preview_window.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_preview_window.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/csh/gui_preview_window.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_accessibleform.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_accessibleform.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_accessibleform.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_accessibleform.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_addcomponent.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_addcomponent.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_addcomponent.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_addcomponent.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_addingtopalette.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_addingtopalette.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_addingtopalette.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_addingtopalette.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_converters.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_converters.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_converters.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_converters.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_data.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_data.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_data.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_data.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_db_working.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_db_working.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_db_working.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_db_working.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_properties.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_properties.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_properties.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_properties.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_synthetic.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_synthetic.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_synthetic.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_synthetic.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_validators.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_validators.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_validators.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_validators.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_working.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_working.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_working.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_bind_working.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_component_align.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_component_align.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_component_align.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_component_align.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_component_size.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_component_size.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_component_size.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_component_size.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_configuring.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_configuring.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_configuring.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_configuring.html @@ -3,7 +3,7 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_containers.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_containers.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_containers.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_containers.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_creatingforms.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_creatingforms.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_creatingforms.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_creatingforms.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_creatingmdi.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_creatingmdi.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_creatingmdi.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_creatingmdi.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_deploying.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_deploying.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_deploying.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_deploying.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_designing.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_designing.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_designing.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_designing.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_editcomponentprops.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_editcomponentprops.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_editcomponentprops.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_editcomponentprops.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_events_managing.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_events_managing.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_events_managing.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_events_managing.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_events_setting.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_events_setting.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_events_setting.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_events_setting.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_modifysource.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_modifysource.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_modifysource.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_modifysource.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_overview.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_overview.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_overview.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_overview.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_previewing.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_previewing.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_previewing.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_previewing.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_quickref.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_quickref.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_quickref.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_quickref.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_selectcomponents.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_selectcomponents.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_selectcomponents.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/gui_selectcomponents.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_customlayout.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_customlayout.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_customlayout.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_customlayout.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_gbcustomizer.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_gbcustomizer.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_gbcustomizer.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_gbcustomizer.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_layoutmanagers.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_layoutmanagers.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_layoutmanagers.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_layoutmanagers.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_layoutprops.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_layoutprops.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_layoutprops.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_layoutprops.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_settinglayout.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_settinglayout.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_settinglayout.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/layout_managers/gui_settinglayout.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_action_csh.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_action_csh.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_action_csh.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_action_csh.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_actions.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_actions.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_actions.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_actions.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_creating.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_creating.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_creating.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_creating.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_resources.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_resources.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_resources.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_resources.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_working.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_working.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_working.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/gui/saf/gui_saf_working.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/csh/hibernate_fromdbwiz_codegen.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/csh/hibernate_fromdbwiz_codegen.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/csh/hibernate_fromdbwiz_codegen.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/csh/hibernate_fromdbwiz_codegen.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_addsupport.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_addsupport.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_addsupport.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_addsupport.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_cfg.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_cfg.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_cfg.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_cfg.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_cfgedit.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_cfgedit.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_cfgedit.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_cfgedit.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_fromdb.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_fromdb.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_fromdb.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_fromdb.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_hql.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_hql.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_hql.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_hql.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_mapping.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_mapping.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_mapping.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_mapping.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_reveng.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_reveng.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_reveng.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_reveng.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_util.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_util.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_util.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_util.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_workingwith.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_workingwith.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_workingwith.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/hibernate/hibernate_workingwith.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/addparams.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/addparams.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/addparams.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/addparams.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/autoinsert.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/autoinsert.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/autoinsert.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/autoinsert.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/bundleformat.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/bundleformat.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/bundleformat.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/bundleformat.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/formedstrings.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/formedstrings.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/formedstrings.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/formedstrings.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18n_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18n_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18n_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18n_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18n_automatic.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18n_automatic.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18n_automatic.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18n_automatic.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18ncodeformat.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18ncodeformat.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18ncodeformat.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18ncodeformat.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18nwizard.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18nwizard.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18nwizard.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/i18nwizard.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/international.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/international.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/international.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/international.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/manualinsert.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/manualinsert.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/manualinsert.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/manualinsert.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/replacingformat.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/replacingformat.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/replacingformat.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/replacingformat.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/testingwizard.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/testingwizard.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/testingwizard.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/internationalize/testingwizard.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/java.hs b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/java.hs --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/java.hs +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/java.hs @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/generate.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/generate.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/generate.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/generate.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/search_window.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/search_window.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/search_window.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/search_window.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/show_in_editor.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/show_in_editor.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/show_in_editor.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/javadoc/show_in_editor.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_configuring.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_configuring.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_configuring.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_configuring.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_creatingtests.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_creatingtests.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_creatingtests.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_creatingtests.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_chooseversion.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_chooseversion.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_chooseversion.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_chooseversion.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_creatingtests.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_creatingtests.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_creatingtests.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_creatingtests.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_emptytest.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_emptytest.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_emptytest.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_emptytest.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_simpletest.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_simpletest.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_simpletest.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_simpletest.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_testsuite.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_testsuite.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_testsuite.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_csh_testsuite.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_debuggingtests.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_debuggingtests.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_debuggingtests.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_debuggingtests.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_overview.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_overview.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_overview.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_overview.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_quickref.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_quickref.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_quickref.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_quickref.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_resultswindow.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_resultswindow.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_resultswindow.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_resultswindow.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_runningtests.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_runningtests.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_runningtests.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/junit/junit_runningtests.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/pending.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/pending.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/pending.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/pending.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/db_persist_addentityclass.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/db_persist_addentityclass.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/db_persist_addentityclass.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/db_persist_addentityclass.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/glossary_persist_context.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/glossary_persist_context.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/glossary_persist_context.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/glossary_persist_context.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_editor_persistenceunit.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_editor_persistenceunit.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_editor_persistenceunit.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_editor_persistenceunit.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db1.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db1.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db1.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db1.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db2.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db2.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db2.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db2.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db3.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db3.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db3.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_entityclass_db3.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_persistenceunit.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_persistenceunit.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_persistenceunit.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/csh/persist_new_persistenceunit.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persist_jpa_fromentity.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persist_jpa_fromentity.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persist_jpa_fromentity.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persist_jpa_fromentity.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_aboutentitymanager.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_aboutentitymanager.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_aboutentitymanager.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_aboutentitymanager.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_aboutunit.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_aboutunit.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_aboutunit.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_aboutunit.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_entityclasses.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_entityclasses.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_entityclasses.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_entityclasses.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_entitymanager.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_entitymanager.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_entitymanager.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_entitymanager.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_fromdb.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_fromdb.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_fromdb.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_fromdb.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_mapping.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_mapping.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_mapping.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_mapping.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_quickref.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_quickref.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_quickref.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_quickref.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_support.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_support.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_support.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_support.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_unit.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_unit.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_unit.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/persistence/general/persistence_unit.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/profiling/profile_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/profiling/profile_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/profiling/profile_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/profiling/profile_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/files_window.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/files_window.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/files_window.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/files_window.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/glossary_freeform.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/glossary_freeform.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/glossary_freeform.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/glossary_freeform.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/glossary_standard.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/glossary_standard.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/glossary_standard.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/glossary_standard.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz1.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz1.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz1.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz1.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz2.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz2.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz2.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-desktopapp_wiz2.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-standapp_wiz.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-standapp_wiz.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-standapp_wiz.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-standapp_wiz.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-standclasslib_wiz.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-standclasslib_wiz.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-standclasslib_wiz.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2se-standclasslib_wiz.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz1.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz1.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz1.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz1.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz2.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz2.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz2.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz2.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz3.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz3.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz3.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2seexistsrc_wiz3.html @@ -1,7 +1,7 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_buildrun.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_buildrun.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_buildrun.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_buildrun.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_classpath.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_classpath.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_classpath.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_classpath.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_output.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_output.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_output.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_output.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_sources.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_sources.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_sources.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_props_sources.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz1.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz1.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz1.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz1.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz2.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz2.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz2.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz2.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz3.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz3.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz3.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz3.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz4.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz4.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz4.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz4.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz5.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz5.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz5.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sefree_wiz5.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_common-app.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_common-app.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_common-app.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_common-app.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_compiling.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_compiling.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_compiling.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_compiling.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_desktop-app.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_desktop-app.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_desktop-app.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_desktop-app.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_documenting.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_documenting.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_documenting.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_documenting.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_libraries.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_libraries.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_libraries.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_libraries.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_packaging.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_packaging.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_packaging.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_packaging.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_run.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_run.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_run.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_run.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_sources.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_sources.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_sources.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_sources.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_webstart.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_webstart.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_webstart.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_webstart.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_wsclient.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_wsclient.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_wsclient.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_wsclient.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_wsclient_disabled.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_wsclient_disabled.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_wsclient_disabled.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_j2sestand_props_wsclient_disabled.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_new_lib_wiz1.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_new_lib_wiz1.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_new_lib_wiz1.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_new_lib_wiz1.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_new_lib_wiz2.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_new_lib_wiz2.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_new_lib_wiz2.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_new_lib_wiz2.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_platform_manager.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_platform_manager.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_platform_manager.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_platform_manager.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_templates.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_templates.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_templates.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_templates.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_window.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_window.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_window.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/csh/proj_window.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_creating.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_creating.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_creating.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_creating.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_deleting.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_deleting.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_deleting.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_deleting.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_add.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_add.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_add.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_add.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_classpath.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_classpath.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_classpath.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_classpath.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_debug.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_debug.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_debug.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_debug.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_debug_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_debug_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_debug_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_debug_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_nbtargs.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_nbtargs.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_nbtargs.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_nbtargs.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_projectxml.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_projectxml.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_projectxml.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_projectxml.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_targets.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_targets.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_targets.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_free_targets.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_icons.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_icons.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_icons.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_icons.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_import.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_import.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_import.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_import.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_main.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_main.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_main.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_main.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_move_copy_rename.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_move_copy_rename.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_move_copy_rename.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_move_copy_rename.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_process.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_process.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_process.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_process.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_quickref.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_quickref.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_quickref.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_quickref.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_sharing.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_sharing.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_sharing.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_sharing.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_sources_multi.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_sources_multi.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_sources_multi.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_sources_multi.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_ant_structure.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_ant_structure.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_ant_structure.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_ant_structure.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_customize.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_customize.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_customize.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_stand_customize.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_templates.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_templates.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_templates.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_templates.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_webfree_debug.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_webfree_debug.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_webfree_debug.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/project/proj_webfree_debug.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/about_resourcebundles.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/about_resourcebundles.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/about_resourcebundles.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/about_resourcebundles.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/addinglocale.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/addinglocale.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/addinglocale.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/addinglocale.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/addingprops.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/addingprops.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/addingprops.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/addingprops.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/creating_resourcebundles.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/creating_resourcebundles.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/creating_resourcebundles.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/creating_resourcebundles.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/editinglocale.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/editinglocale.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/editinglocale.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/editinglocale.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/modifyprops.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/modifyprops.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/modifyprops.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/propfiles/modifyprops.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/aboutRefactoring.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/aboutRefactoring.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/aboutRefactoring.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/aboutRefactoring.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/changeParameters.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/changeParameters.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/changeParameters.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/changeParameters.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/convertAnonymous.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/convertAnonymous.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/convertAnonymous.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/convertAnonymous.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/copyClass.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/copyClass.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/copyClass.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/copyClass.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/change-method-parameters_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/change-method-parameters_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/change-method-parameters_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/change-method-parameters_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/copy-class_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/copy-class_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/copy-class_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/copy-class_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/encapsulate-fields_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/encapsulate-fields_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/encapsulate-fields_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/encapsulate-fields_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-interface_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-interface_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-interface_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-interface_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-method_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-method_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-method_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-method_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-superclass_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-superclass_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-superclass_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/extract-superclass_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/findUsages-CSH.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/findUsages-CSH.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/findUsages-CSH.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/findUsages-CSH.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/move-class_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/move-class_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/move-class_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/move-class_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/move-inner_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/move-inner_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/move-inner_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/move-inner_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/previewWindow.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/previewWindow.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/previewWindow.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/previewWindow.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/pull-up_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/pull-up_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/pull-up_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/pull-up_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/push-down_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/push-down_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/push-down_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/push-down_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/rename_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/rename_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/rename_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/rename_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/safe-delete_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/safe-delete_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/safe-delete_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/safe-delete_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/usagesWindow.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/usagesWindow.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/usagesWindow.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/usagesWindow.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/use-supertype_db.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/use-supertype_db.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/use-supertype_db.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/csh/use-supertype_db.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/encapsulateField.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/encapsulateField.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/encapsulateField.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/encapsulateField.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractInterface.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractInterface.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractInterface.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractInterface.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractMethod.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractMethod.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractMethod.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractMethod.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractSuperclass.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractSuperclass.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractSuperclass.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/extractSuperclass.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/findClass.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/findClass.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/findClass.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/findClass.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/moveClass.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/moveClass.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/moveClass.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/moveClass.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/moveInner.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/moveInner.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/moveInner.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/moveInner.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/pullUp.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/pullUp.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/pullUp.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/pullUp.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/pushDown.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/pushDown.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/pushDown.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/pushDown.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/refactorQuickRef.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/refactorQuickRef.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/refactorQuickRef.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/refactorQuickRef.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/renameClass.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/renameClass.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/renameClass.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/renameClass.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/renameField.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/renameField.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/renameField.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/renameField.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/safeDelete.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/safeDelete.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/safeDelete.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/safeDelete.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/undo.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/undo.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/undo.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/undo.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/useSupertype.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/useSupertype.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/useSupertype.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/refactor/useSupertype.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_app.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_app.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_app.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_app.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_args.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_args.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_args.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_args.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_classpath.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_classpath.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_classpath.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_classpath.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_file.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_file.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_file.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_file.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_jvm_args.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_jvm_args.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_jvm_args.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_jvm_args.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_process.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_process.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_process.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_process.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_quickref.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_quickref.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_quickref.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/run/run_quickref.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/about.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/about.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/about.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/about.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/add-support.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/add-support.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/add-support.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/add-support.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/create-config-file.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/create-config-file.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/create-config-file.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/create-config-file.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/locate-beans.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/locate-beans.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/locate-beans.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/locate-beans.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/organize-files.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/organize-files.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/organize-files.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/spring/organize-files.html @@ -1,6 +1,6 @@ diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/tbd.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/tbd.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/tbd.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/tbd.html @@ -1,6 +1,6 @@ diff --git a/jumpto/src/org/netbeans/modules/jumpto/SearchHistory.java b/jumpto/src/org/netbeans/modules/jumpto/SearchHistory.java --- a/jumpto/src/org/netbeans/modules/jumpto/SearchHistory.java +++ b/jumpto/src/org/netbeans/modules/jumpto/SearchHistory.java @@ -139,6 +139,10 @@ LOGGER.fine("String to store is empty => ignoring."); return; } + if (text.contains(DELIMITER)){ + LOGGER.fine("String to store contain delimeter => ignoring."); + return; + } if (data.remove(text)) { LOGGER.fine(String.format("Text %s already in history, removing and readding.", text)); } diff --git a/maven/javahelp/org/netbeans/modules/maven/docs/credits.html b/maven/javahelp/org/netbeans/modules/maven/docs/credits.html --- a/maven/javahelp/org/netbeans/modules/maven/docs/credits.html +++ b/maven/javahelp/org/netbeans/modules/maven/docs/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-newproj-archetype.html b/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-newproj-archetype.html --- a/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-newproj-archetype.html +++ b/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-newproj-archetype.html @@ -1,6 +1,6 @@ diff --git a/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-newproj-basic.html b/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-newproj-basic.html --- a/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-newproj-basic.html +++ b/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-newproj-basic.html @@ -1,6 +1,6 @@ diff --git a/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-options.html b/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-options.html --- a/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-options.html +++ b/maven/javahelp/org/netbeans/modules/maven/docs/csh/maven-options.html @@ -1,6 +1,6 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/credits.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/credits.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/credits.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/credits.html @@ -1,7 +1,7 @@ @@ -14,7 +14,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -37,8 +37,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-clone.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-clone.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-clone.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-clone.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-merge-revs.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-merge-revs.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-merge-revs.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-merge-revs.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-pullother.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-pullother.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-pullother.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-pullother.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-pushother.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-pushother.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-pushother.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-pushother.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-revert-mods.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-revert-mods.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-revert-mods.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-revert-mods.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-update.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-update.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-update.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/csh/mercurial-update.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-about.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-about.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-about.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-about.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-cloneother.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-cloneother.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-cloneother.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-cloneother.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-diffviewer.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-diffviewer.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-diffviewer.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-diffviewer.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-import.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-import.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-import.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-import.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-options.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-options.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-options.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-options.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-properties.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-properties.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-properties.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-properties.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-quickref.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-quickref.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-quickref.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-quickref.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-setup.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-setup.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-setup.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-setup.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-status.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-status.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-status.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-status.html @@ -1,7 +1,7 @@ diff --git a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-statuswindow.html b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-statuswindow.html --- a/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-statuswindow.html +++ b/mercurial/javahelp/org/netbeans/modules/mercurial/docs/mercurial-statuswindow.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/emulator/emulator_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/emulator/emulator_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/emulator/emulator_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/emulator/emulator_about.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/getstart/welcome.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/getstart/welcome.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/getstart/welcome.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/getstart/welcome.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/project/csh/proj_cdc-standapp_wiz.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/project/csh/proj_cdc-standapp_wiz.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/project/csh/proj_cdc-standapp_wiz.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/project/csh/proj_cdc-standapp_wiz.html @@ -2,7 +2,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/project/project_quickref.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/project/project_quickref.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/project/project_quickref.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/cdc/project/project_quickref.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/abilities_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/abilities_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/abilities_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/abilities_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/abilities_add.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/abilities_add.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/abilities_add.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/abilities_add.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_add.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_add.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_add.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_add.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_customizing.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_customizing.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_customizing.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_customizing.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_quickref.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_quickref.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_quickref.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_quickref.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_setdefault.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_setdefault.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_setdefault.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_setdefault.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_templatecreating.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_templatecreating.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_templatecreating.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_templatecreating.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_working.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_working.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_working.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/config_working.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_comparison.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_comparison.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_comparison.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_comparison.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_manage.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_manage.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_manage.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocess_manage.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocessor_directives_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocessor_directives_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocessor_directives_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/configuration/preprocessor_directives_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/about_deployment.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/about_deployment.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/about_deployment.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/about_deployment.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/about_ota.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/about_ota.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/about_ota.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/about_ota.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_copy.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_copy.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_copy.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_copy.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_deploying.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_deploying.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_deploying.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_deploying.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_devanywhere.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_devanywhere.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_devanywhere.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_devanywhere.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_ftp.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_ftp.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_ftp.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_ftp.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_increment.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_increment.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_increment.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_increment.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_nokia.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_nokia.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_nokia.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_nokia.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_ricoh.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_ricoh.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_ricoh.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_ricoh.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_scp.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_scp.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_scp.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_scp.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_se.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_se.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_se.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_se.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_webdav.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_webdav.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_webdav.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_webdav.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_winmobile.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_winmobile.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_winmobile.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/deploy/deploy_winmobile.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/emulator/emulator_adding.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/emulator/emulator_adding.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/emulator/emulator_adding.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/emulator/emulator_adding.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/games/games_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/games/games_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/games/games_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/games/games_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/games/games_quickref.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/games/games_quickref.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/games/games_quickref.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/games/games_quickref.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/credits.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/credits.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/credits.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/guides.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/guides.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/guides.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/guides.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/importprojects.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/importprojects.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/importprojects.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/importprojects.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/installingexamples.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/installingexamples.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/installingexamples.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/installingexamples.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/support.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/support.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/support.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/support.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/welcome.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/welcome.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/welcome.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/getstarted/welcome.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_appmgmtsoftware.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_appmgmtsoftware.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_appmgmtsoftware.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_appmgmtsoftware.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_attributes.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_attributes.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_attributes.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_attributes.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_cldc.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_cldc.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_cldc.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_cldc.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_configuration.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_configuration.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_configuration.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_configuration.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_deviceconfiguration.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_deviceconfiguration.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_deviceconfiguration.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_deviceconfiguration.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_devicefragmentation.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_devicefragmentation.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_devicefragmentation.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_devicefragmentation.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_gamebuilder.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_gamebuilder.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_gamebuilder.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_gamebuilder.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jad.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jad.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jad.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jad.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jsr172.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jsr172.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jsr172.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jsr172.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jwti.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jwti.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jwti.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_jwti.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_manifest.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_manifest.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_manifest.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_manifest.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midlet.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midlet.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midlet.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midlet.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midletsuite.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midletsuite.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midletsuite.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midletsuite.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midp.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midp.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midp.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_midp.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_platform.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_platform.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_platform.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_platform.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_profile.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_profile.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_profile.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_profile.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_project.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_project.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_project.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_project.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_scenes.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_scenes.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_scenes.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_scenes.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_sprites.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_sprites.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_sprites.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_sprites.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_svg.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_svg.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_svg.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_svg.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_tiledlayers.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_tiledlayers.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_tiledlayers.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_tiledlayers.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_uei.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_uei.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_uei.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/glossary/gloss_uei.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/jmunit/jmunit_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/jmunit/jmunit_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/jmunit/jmunit_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/jmunit/jmunit_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/jmunit/jmunit_working.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/jmunit/jmunit_working.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/jmunit/jmunit_working.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/jmunit/jmunit_working.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/l10n/l10n_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/l10n/l10n_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/l10n/l10n_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/l10n/l10n_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/l10n/l10n_addsupport.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/l10n/l10n_addsupport.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/l10n/l10n_addsupport.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/l10n/l10n_addsupport.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_addproj.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_addproj.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_addproj.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_addproj.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_working.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_working.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_working.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/midlets/midlet_working.html @@ -2,7 +2,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_addcustomcomponent.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_addcustomcomponent.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_addcustomcomponent.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_addcustomcomponent.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_quickref.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_quickref.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_quickref.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_quickref.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_working.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_working.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_working.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/mvd/mvd_working.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_creating.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_creating.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_creating.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_creating.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_quickref.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_quickref.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_quickref.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_quickref.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_templates.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_templates.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_templates.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_templates.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_working.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_working.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_working.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/projects/proj_working.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/api_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/api_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/api_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/api_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/jad_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/jad_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/jad_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/jad_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/jarmanifest_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/jarmanifest_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/jarmanifest_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/jarmanifest_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/obfuscation_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/obfuscation_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/obfuscation_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/obfuscation_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_addAPI.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_addAPI.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_addAPI.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_addAPI.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_addlibrary.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_addlibrary.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_addlibrary.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_addlibrary.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_customize_build.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_customize_build.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_customize_build.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_customize_build.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_customizesecurity.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_customizesecurity.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_customizesecurity.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_customizesecurity.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setMIDlet.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setMIDlet.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setMIDlet.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setMIDlet.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_set_jad.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_set_jad.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_set_jad.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_set_jad.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setfiltering.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setfiltering.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setfiltering.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setfiltering.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setjar.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setjar.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setjar.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setjar.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setjavadoc.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setjavadoc.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setjavadoc.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setjavadoc.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setobfuscation.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setobfuscation.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setobfuscation.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setobfuscation.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setplatform.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setplatform.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setplatform.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setplatform.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setpushregistry.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setpushregistry.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setpushregistry.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setpushregistry.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setrun.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setrun.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setrun.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_setrun.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_viewgeneral.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_viewgeneral.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_viewgeneral.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/prop_viewgeneral.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/pushregistry_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/pushregistry_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/pushregistry_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/properties/pushregistry_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_inota.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_inota.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_inota.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_inota.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_runapps.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_runapps.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_runapps.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_runapps.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_runheadlessapps.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_runheadlessapps.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_runheadlessapps.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/running/run_runheadlessapps.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_createkeypair.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_createkeypair.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_createkeypair.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_createkeypair.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_createkeystore.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_createkeystore.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_createkeystore.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_createkeystore.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_exportkey.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_exportkey.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_exportkey.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_exportkey.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_setdomain.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_setdomain.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_setdomain.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/security/signing_setdomain.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_about.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_about.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_about.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_about.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_animations.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_animations.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_animations.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_animations.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_menus.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_menus.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_menus.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_menus.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_quickref.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_quickref.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_quickref.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_quickref.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_splashscreen.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_splashscreen.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_splashscreen.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_splashscreen.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_waitscreen.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_waitscreen.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_waitscreen.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_waitscreen.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_working.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_working.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_working.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/svg/svg_working.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/toolkit/about_toolkit.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/toolkit/about_toolkit.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/toolkit/about_toolkit.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/toolkit/about_toolkit.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/toolkit/toolkit_using.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/toolkit/toolkit_using.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/toolkit/toolkit_using.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/toolkit/toolkit_using.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addability.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addability.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addability.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addability.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addapi.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addapi.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addapi.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addapi.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addattribute.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addattribute.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addattribute.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addattribute.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addconfiguration.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addconfiguration.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addconfiguration.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addconfiguration.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addkeystore.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addkeystore.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addkeystore.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addkeystore.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addlibrary.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addlibrary.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addlibrary.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addlibrary.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addmidlet.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addmidlet.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addmidlet.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addmidlet.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addpushregistry.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addpushregistry.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addpushregistry.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_addpushregistry.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_configtemplate.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_configtemplate.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_configtemplate.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_configtemplate.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_createkeypair.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_createkeypair.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_createkeypair.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_createkeypair.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_enterpassword.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_enterpassword.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_enterpassword.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_enterpassword.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_exportkey.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_exportkey.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_exportkey.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_exportkey.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_miscoptions_svg.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_miscoptions_svg.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_miscoptions_svg.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_miscoptions_svg.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_newability.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_newability.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_newability.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_newability.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_platformmanager.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_platformmanager.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_platformmanager.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_platformmanager.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_projectconfigs.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_projectconfigs.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_projectconfigs.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_projectconfigs.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_projectconfigurationmanager.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_projectconfigurationmanager.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_projectconfigurationmanager.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_projectconfigurationmanager.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_quickprojectrun.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_quickprojectrun.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_quickprojectrun.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_quickprojectrun.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_securitymanager.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_securitymanager.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_securitymanager.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_securitymanager.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_upgradeinformation.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_upgradeinformation.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_upgradeinformation.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/dialog_upgradeinformation.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_actioneditor.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_actioneditor.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_actioneditor.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_actioneditor.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_componentpallette.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_componentpallette.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_componentpallette.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_componentpallette.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_componentpallettemanager.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_componentpallettemanager.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_componentpallettemanager.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_componentpallettemanager.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_debugview.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_debugview.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_debugview.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_debugview.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_flowdesigner.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_flowdesigner.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_flowdesigner.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_flowdesigner.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_inspector.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_inspector.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_inspector.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_inspector.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_properties.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_properties.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_properties.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_properties.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_screendesigner.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_screendesigner.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_screendesigner.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_screendesigner.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_stringeditor.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_stringeditor.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_stringeditor.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/mvd_stringeditor.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/node_project.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/node_project.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/node_project.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/node_project.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_abilities.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_abilities.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_abilities.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_abilities.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_apipermissions.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_apipermissions.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_apipermissions.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_apipermissions.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_appdescriptor.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_appdescriptor.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_appdescriptor.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_appdescriptor.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_build.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_build.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_build.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_build.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_compiling.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_compiling.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_compiling.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_compiling.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_createjar.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_createjar.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_createjar.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_createjar.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_deploy.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_deploy.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_deploy.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_deploy.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_filtering.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_filtering.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_filtering.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_filtering.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_general.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_general.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_general.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_general.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_jad.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_jad.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_jad.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_jad.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_javadoc.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_javadoc.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_javadoc.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_javadoc.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_libraries.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_libraries.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_libraries.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_libraries.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_midlets.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_midlets.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_midlets.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_midlets.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_obfuscating.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_obfuscating.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_obfuscating.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_obfuscating.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_platform.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_platform.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_platform.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_platform.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_pushregistry.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_pushregistry.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_pushregistry.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_pushregistry.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_running.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_running.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_running.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_running.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_signing.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_signing.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_signing.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/projectprop_signing.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addcomponent_selectclasses.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addcomponent_selectclasses.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addcomponent_selectclasses.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addcomponent_selectclasses.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addcomponent_selectproject.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addcomponent_selectproject.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addcomponent_selectproject.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addcomponent_selectproject.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_bootstrap.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_bootstrap.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_bootstrap.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_bootstrap.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_choosefolder.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_choosefolder.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_choosefolder.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_choosefolder.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_gi.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_gi.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_gi.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_gi.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_platforms.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_platforms.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_platforms.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_platforms.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_sources.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_sources.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_sources.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_addplatform_sources.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_importexisting_specifysource.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_importexisting_specifysource.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_importexisting_specifysource.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_importexisting_specifysource.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_importwtk_specifysource.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_importwtk_specifysource.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_importwtk_specifysource.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_importwtk_specifysource.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newcdcproject_platformselection.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newcdcproject_platformselection.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newcdcproject_platformselection.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newcdcproject_platformselection.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newcustom_component.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newcustom_component.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newcustom_component.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newcustom_component.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newfile_name.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newfile_name.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newfile_name.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newfile_name.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newlocalization_name.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newlocalization_name.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newlocalization_name.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newlocalization_name.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newproject_moreconfigurations.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newproject_moreconfigurations.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newproject_moreconfigurations.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newproject_moreconfigurations.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newproject_name.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newproject_name.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newproject_name.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_newproject_name.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_vdfname.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_vdfname.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_vdfname.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_vdfname.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_clientinformation.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_clientinformation.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_clientinformation.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_clientinformation.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_clientoptions.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_clientoptions.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_clientoptions.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_clientoptions.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_serviceselection.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_serviceselection.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_serviceselection.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_serviceselection.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_webappselection.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_webappselection.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_webappselection.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcb_webappselection.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcwexportedservices.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcwexportedservices.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcwexportedservices.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/ui/wizard_wcwexportedservices.html @@ -1,6 +1,6 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_creating.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_creating.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_creating.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_creating.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_jsr172.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_jsr172.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_jsr172.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_jsr172.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_updatingjsr172.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_updatingjsr172.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_updatingjsr172.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_updatingjsr172.html @@ -1,7 +1,7 @@ diff --git a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_wsdl.html b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_wsdl.html --- a/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_wsdl.html +++ b/mobility.javahelp/javahelp/org/netbeans/modules/mobility/project/docs/wcw/wcw_wsdl.html @@ -1,7 +1,7 @@ diff --git a/nbi/engine/src/org/netbeans/installer/Installer.java b/nbi/engine/src/org/netbeans/installer/Installer.java --- a/nbi/engine/src/org/netbeans/installer/Installer.java +++ b/nbi/engine/src/org/netbeans/installer/Installer.java @@ -112,6 +112,7 @@ initializeErrorHandler(); dumpSystemInfo(); + EngineUtils.checkEngine(); initializePlatform(); instance = this; diff --git a/nbi/engine/src/org/netbeans/installer/product/components/ProductConfigurationLogic.java b/nbi/engine/src/org/netbeans/installer/product/components/ProductConfigurationLogic.java --- a/nbi/engine/src/org/netbeans/installer/product/components/ProductConfigurationLogic.java +++ b/nbi/engine/src/org/netbeans/installer/product/components/ProductConfigurationLogic.java @@ -40,6 +40,7 @@ import java.io.InputStream; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import org.netbeans.installer.utils.FileUtils; import org.netbeans.installer.utils.ResourceUtils; @@ -254,6 +255,13 @@ protected final String getString(String key) { return ResourceUtils.getString(getClass(), key); } + + protected final Map getStrings(String key) { + return ResourceUtils.getStrings(getClass(), key); + } + protected final Map getStrings(String key, Object... arguments) { + return ResourceUtils.getStrings(getClass(), key, arguments); + } protected final String getString(String key, Object... arguments) { return ResourceUtils.getString(getClass(), key, arguments); diff --git a/nbi/engine/src/org/netbeans/installer/utils/EngineUtils.java b/nbi/engine/src/org/netbeans/installer/utils/EngineUtils.java --- a/nbi/engine/src/org/netbeans/installer/utils/EngineUtils.java +++ b/nbi/engine/src/org/netbeans/installer/utils/EngineUtils.java @@ -38,7 +38,9 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.net.URL; +import java.net.URLClassLoader; import java.net.URLDecoder; import java.util.jar.Attributes; import java.util.jar.JarEntry; @@ -130,6 +132,57 @@ LogManager.logUnindent("... finished caching engine data"); } + + + public static void checkEngine() { + Class mainClass = getEngineMainClass(); + String thisClassResource = ResourceUtils.getResourceClassName(mainClass); + InputStream is = mainClass.getClassLoader().getResourceAsStream(thisClassResource); + ClassLoader cl = mainClass.getClassLoader(); + boolean exclamationMarkInURL = false; + if (cl instanceof URLClassLoader) { + URLClassLoader ucl = (URLClassLoader) cl; + for (URL url : ucl.getURLs()) { + exclamationMarkInURL = exclamationMarkInURL || url.getPath().contains("!"); + } + } + if (is == null) { + if (exclamationMarkInURL) { + String message; + if (System.getProperty("user.home").contains("!")) { + //Issue #156011 + //Note: don`t use ResourceUtils for getting string here. + message = + "Looks like the name of current user profile directory contains an exclamation mark (!):\n" + + SystemUtils.getUserHomeDirectory() + "\n\n" + + "It is not recommended to use such profile names due to JDK bugs:\n" + + "http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4730642" + "\n" + + "http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4523159" + "\n" + "\n" + + "That bugs affects the installer work as well.\n" + + "The workaround is to run installer with different temporary and working installer directory.\n" + + "For example, try run installer with the following arguments:\n" + + "--tempdir " + new File(System.getenv("SystemDrive"), "Temp") + " " + + "--userdir " + new File(System.getenv("SystemDrive"), "NBI") + "\n"; + + } else { + // some generic message + message = + "Cannot load the main class " + mainClass.getName() + " from the jar file due to JDK bugs:\n" + + "http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4730642" + "\n" + + "http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4523159" + "\n" + "\n" + + "Use other directory for the jar file.\n"; + } + + ErrorManager.notifyCritical(message); + } + } else { + try { + is.close(); + } catch (IOException e) { + } + } + } + private static File getEngineLocation() { final String propName = EngineResources.LOCAL_ENGINE_PATH_PROPERTY; @@ -206,5 +259,5 @@ } public static final String DEFAULT_ENGINE_JAR_NAME = "nbi-engine.jar";//NOI18N - + } diff --git a/nbi/engine/src/org/netbeans/installer/utils/ErrorManager.java b/nbi/engine/src/org/netbeans/installer/utils/ErrorManager.java --- a/nbi/engine/src/org/netbeans/installer/utils/ErrorManager.java +++ b/nbi/engine/src/org/netbeans/installer/utils/ErrorManager.java @@ -123,39 +123,37 @@ ERROR_LOGFILE_INFO_KEY, LogManager.getLogFile().getAbsolutePath()); } + String titleKey = null; + UiUtils.MessageType type; + switch (level) { case ErrorLevel.MESSAGE: - UiUtils.showMessageDialog( - dialogText, - ResourceUtils.getString( - ErrorManager.class, ERROR_MESSAGE_KEY), - UiUtils.MessageType.INFORMATION); - return; + titleKey = ERROR_MESSAGE_KEY; + type = UiUtils.MessageType.INFORMATION; + break; case ErrorLevel.WARNING: - UiUtils.showMessageDialog( - dialogText, - ResourceUtils.getString( - ErrorManager.class, ERROR_WARNING_KEY), - UiUtils.MessageType.WARNING); - return; + titleKey = ERROR_WARNING_KEY; + type = UiUtils.MessageType.WARNING; + break; case ErrorLevel.ERROR: - UiUtils.showMessageDialog( - dialogText, - ResourceUtils.getString( - ErrorManager.class, ERROR_ERROR_KEY), - UiUtils.MessageType.ERROR); - return; + titleKey = ERROR_ERROR_KEY; + type = UiUtils.MessageType.ERROR; + break; case ErrorLevel.CRITICAL: - UiUtils.showMessageDialog( - dialogText, - ResourceUtils.getString( - ErrorManager.class, ERROR_CRITICAL_KEY), - UiUtils.MessageType.CRITICAL); - finishHandler.criticalExit(); - return; + titleKey = ERROR_CRITICAL_KEY; + type = UiUtils.MessageType.CRITICAL; + break; default: return; } + String title = ResourceUtils.getString(ErrorManager.class, titleKey); + if(title == null) { + titleKey = type.toString(); + } + UiUtils.showMessageDialog(dialogText, titleKey, type); + if(type.equals(UiUtils.MessageType.CRITICAL)) { + finishHandler.criticalExit(); + } } public static UncaughtExceptionHandler getExceptionHandler() { diff --git a/nbi/engine/src/org/netbeans/installer/utils/ResourceUtils.java b/nbi/engine/src/org/netbeans/installer/utils/ResourceUtils.java --- a/nbi/engine/src/org/netbeans/installer/utils/ResourceUtils.java +++ b/nbi/engine/src/org/netbeans/installer/utils/ResourceUtils.java @@ -38,8 +38,12 @@ import java.io.IOException; import java.io.InputStream; +import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; +import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.MissingResourceException; import java.util.ResourceBundle; @@ -91,6 +95,37 @@ return format(getString(clazz, key), arguments); } + public static Map getStrings( + final String baseName, + final String key, + final ClassLoader loader, + final Object... arguments) { + Map map = getBundleMessagesMapForKey(baseName, key, loader); + if(arguments.length == 0) { + return map; + } else { + Map result = new HashMap(); + for(Locale locale : map.keySet()) { + result.put(locale, format(map.get(locale), arguments)); + } + return result; + } + } + + public static Map getStrings( + final String baseName, + final String key, + final Object... arguments) { + return getStrings(baseName, key, ResourceUtils.class.getClassLoader(), arguments); + } + + public static Map getStrings( + final Class clazz, + final String key, + final Object... arguments) { + return getStrings(getBundleResource(clazz), key, clazz.getClassLoader(), arguments); + } + private static String format( final String message, final Object... arguments) { @@ -156,7 +191,8 @@ final String baseName, final Locale locale, final ClassLoader loader) { - final String bundleId = loader.toString() + baseName; + final String bundleId = loader.toString() + baseName + + (locale.toString().equals(StringUtils.EMPTY_STRING) ? StringUtils.EMPTY_STRING : ("_" + locale)); ResourceBundle bundle = (ResourceBundle) loadedBundles.get(bundleId); @@ -200,6 +236,23 @@ } return message; } + + private static Map getBundleMessagesMapForKey( + final String baseName, + final String key, + final ClassLoader loader) { + Map map = new HashMap (); + List list = new ArrayList (); + list.add(new Locale(StringUtils.EMPTY_STRING)); + list.addAll(Arrays.asList(Locale.getAvailableLocales())); + for(Locale locale : list) { + ResourceBundle bundle = loadBundle(baseName, locale, loader); + if(bundle!=null && locale.equals(bundle.getLocale()) && !map.containsKey(bundle.getLocale())) { + map.put(locale, getBundleMessage(baseName, locale, loader, key)); + } + } + return map; + } private static String getBundleResource(final Class clazz) { return clazz.getPackage().getName() + BUNDLE_FILE_SUFFIX; diff --git a/nbi/engine/src/org/netbeans/installer/utils/system/MacOsNativeUtils.java b/nbi/engine/src/org/netbeans/installer/utils/system/MacOsNativeUtils.java --- a/nbi/engine/src/org/netbeans/installer/utils/system/MacOsNativeUtils.java +++ b/nbi/engine/src/org/netbeans/installer/utils/system/MacOsNativeUtils.java @@ -118,18 +118,30 @@ } @Override public File getShortcutLocation(Shortcut shortcut, LocationType locationType) throws NativeException { + if(shortcut.getPath()!=null) { + return new File(shortcut.getPath()); + } + String fileName = getShortcutFilename(shortcut); - + File file = null; switch (locationType) { case CURRENT_USER_DESKTOP: - return new File(SystemUtils.getUserHomeDirectory(), "Desktop/" + fileName); + file = new File(SystemUtils.getUserHomeDirectory(), "Desktop/" + fileName); + break; case ALL_USERS_DESKTOP: - return new File(SystemUtils.getUserHomeDirectory(), "Desktop/" + fileName); + file = new File(SystemUtils.getUserHomeDirectory(), "Desktop/" + fileName); + break; case CURRENT_USER_START_MENU: - return getDockPropertiesFile(); + file = getDockPropertiesFile(); + break; case ALL_USERS_START_MENU: - return getDockPropertiesFile(); + file = getDockPropertiesFile(); + break; + case CUSTOM: + file = new File(shortcut.getRelativePath(), fileName); + break; } + shortcut.setPath(file.getAbsolutePath()); return null; } @@ -147,29 +159,37 @@ } @Override public File createShortcut(Shortcut shortcut, LocationType locationType) throws NativeException { - final File shortcutFile = getShortcutLocation(shortcut, locationType); - try { - - if (locationType == LocationType.CURRENT_USER_DESKTOP || - locationType == LocationType.ALL_USERS_DESKTOP ) { - // create a symlink on desktop for files/directories and .url for internet shortcuts - if(!shortcutFile.exists()) { - if(shortcut instanceof FileShortcut) { - createSymLink(shortcutFile, ((FileShortcut) shortcut).getTarget()); - } else if(shortcut instanceof InternetShortcut) { - createURLShortcut((InternetShortcut)shortcut); + final File shortcutFile = getShortcutLocation(shortcut, locationType); + switch (locationType) { + case CURRENT_USER_DESKTOP: + case ALL_USERS_DESKTOP: + case CUSTOM: + // create a symlink for files/directories and .url for internet shortcuts + if (!shortcutFile.exists()) { + if (shortcut instanceof FileShortcut) { + createSymLink(shortcutFile, ((FileShortcut) shortcut).getTarget()); + } else if (shortcut instanceof InternetShortcut) { + createURLShortcut((InternetShortcut) shortcut); + } } - - } - } else if(shortcut instanceof FileShortcut && - convertDockProperties(true)==0) { //create link in the Dock - if (modifyDockLink((FileShortcut)shortcut, shortcutFile, true)) { - LogManager.log(ErrorLevel.DEBUG, - " Updating Dock"); - convertDockProperties(false); - SystemUtils.executeCommand(null,UPDATE_DOCK_COMMAND); - } + break; + case CURRENT_USER_START_MENU: + case ALL_USERS_START_MENU: + if (shortcut instanceof FileShortcut && + convertDockProperties(true) == 0) { + //create link in the Dock + if (modifyDockLink((FileShortcut) shortcut, shortcutFile, true)) { + LogManager.log(ErrorLevel.DEBUG, + " Updating Dock"); + convertDockProperties(false); + SystemUtils.executeCommand(null, UPDATE_DOCK_COMMAND); + } + } + break; + default: + LogManager.log("... unknown shortcut type " + locationType); + return null; } return shortcutFile; } catch (IOException e) { @@ -178,24 +198,32 @@ } @Override public void removeShortcut(Shortcut shortcut, LocationType locationType, boolean cleanupParents) throws NativeException { - final File shortcutFile = getShortcutLocation(shortcut, locationType); - try { - if (locationType == LocationType.CURRENT_USER_DESKTOP || - locationType == LocationType.ALL_USERS_DESKTOP ) { - // create a symlink on desktop - if(shortcutFile.exists()) { - FileUtils.deleteFile(shortcutFile,false); - } - } else if(shortcut instanceof FileShortcut && - convertDockProperties(true)==0) {//create link in the Dock - if(modifyDockLink((FileShortcut) shortcut,shortcutFile,false)) { - LogManager.log(ErrorLevel.DEBUG, - " Updating Dock"); - if(convertDockProperties(false)==0) { - SystemUtils.executeCommand(null,UPDATE_DOCK_COMMAND); + final File shortcutFile = getShortcutLocation(shortcut, locationType); + switch(locationType) { + case CURRENT_USER_DESKTOP: + case ALL_USERS_DESKTOP: + case CUSTOM: + // remove symlink from desktop + if(shortcutFile.exists()) { + FileUtils.deleteFile(shortcutFile,false); } - } + break; + case CURRENT_USER_START_MENU : + case ALL_USERS_START_MENU : + if (shortcut instanceof FileShortcut && + convertDockProperties(true) == 0) { + //remove link from the Dock + if (modifyDockLink((FileShortcut) shortcut, shortcutFile, false)) { + LogManager.log(ErrorLevel.DEBUG, "... updating Dock"); + if (convertDockProperties(false) == 0) { + SystemUtils.executeCommand(null, UPDATE_DOCK_COMMAND); + } + } + } + break; + default: + LogManager.log("... unknown shortcut type " + locationType); } } catch (IOException e) { throw new NativeException("Cannot remove shortcut", e); @@ -222,10 +250,13 @@ public boolean isTiger() { return (getOSVersion().startsWith("10.4")); } - + public boolean isLeopard() { return (getOSVersion().startsWith("10.5")); } + public boolean isSnowLeopard() { + return (getOSVersion().startsWith("10.6")); + } // private ////////////////////////////////////////////////////////////////////// private String getOSVersion() { @@ -488,7 +519,7 @@ int returnResult = 0; try { if(!isCheetah() && !isPuma()) { - if((!decode && (isTiger() || isLeopard())) || decode) { + if((!decode && (isTiger() || isLeopard() || isSnowLeopard())) || decode) { // decode for all except Cheetah and Puma // code only for Tiger and Leopard diff --git a/nbi/engine/src/org/netbeans/installer/utils/system/UnixNativeUtils.java b/nbi/engine/src/org/netbeans/installer/utils/system/UnixNativeUtils.java --- a/nbi/engine/src/org/netbeans/installer/utils/system/UnixNativeUtils.java +++ b/nbi/engine/src/org/netbeans/installer/utils/system/UnixNativeUtils.java @@ -46,6 +46,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; @@ -268,6 +269,9 @@ LogManager.logIndent( "devising the shortcut location by type: " + locationType); // NOI18N + if(shortcut.getPath()!=null) { + return new File(shortcut.getPath()); + } final File shortcutFile; switch (locationType) { @@ -293,11 +297,20 @@ shortcutFile = new File(allUsersAppFolder, getShortcutFileName(shortcut)); break; + case CUSTOM: + final String folder = shortcut.getRelativePath(); + + LogManager.log("... custom folder : " + folder); + shortcutFile = new File(folder, + getShortcutFileName(shortcut)); + break; default: shortcutFile = null; } - + if(shortcutFile!=null) { + shortcut.setPath(shortcutFile.getAbsolutePath()); + } LogManager.logUnindent( "shortcut file: " + shortcutFile); // NOI18N @@ -480,13 +493,29 @@ } return new File(userHome, "Desktop"); } + + private void addLocalizedMapEntry(List list, String entryName, Map entryMap) { + if (!entryMap.isEmpty()) { + String name = entryMap.get(new Locale(StringUtils.EMPTY_STRING)); + if(name==null) { + name = entryMap.get(Locale.getDefault()); + } + list.add(entryName + "=" + name); + for (Locale locale : entryMap.keySet()) { + if (!name.equals(entryMap.get(locale))) { + list.add(entryName + "[" + locale + "]=" + StringUtils.getLocalizedString(entryMap, locale)); + } + } + } + } private List getDesktopEntry(FileShortcut shortcut) { final List list = new ArrayList (); list.add("[Desktop Entry]"); list.add("Encoding=UTF-8"); - list.add("Name=" + shortcut.getName()); + addLocalizedMapEntry(list, "Name", shortcut.getNames()); + addLocalizedMapEntry(list, "Comment", shortcut.getDescriptions()); list.add("Exec=/bin/sh \"" + shortcut.getTarget() + "\"" + ((shortcut.getArguments()!=null && shortcut.getArguments().size()!=0) ? StringUtils.SPACE + shortcut.getArgumentsString() : StringUtils.EMPTY_STRING) @@ -512,7 +541,9 @@ final List list = new ArrayList (); list.add("[Desktop Entry]"); list.add("Encoding=UTF-8"); - list.add("Name=" + shortcut.getName()); + addLocalizedMapEntry(list, "Name", shortcut.getNames()); + addLocalizedMapEntry(list, "Comment", shortcut.getDescriptions()); + list.add("URL=" + shortcut.getURL()); if(shortcut.getIcon()!=null) { list.add("Icon=" + shortcut.getIconPath()); diff --git a/nbi/engine/src/org/netbeans/installer/utils/system/WindowsNativeUtils.java b/nbi/engine/src/org/netbeans/installer/utils/system/WindowsNativeUtils.java --- a/nbi/engine/src/org/netbeans/installer/utils/system/WindowsNativeUtils.java +++ b/nbi/engine/src/org/netbeans/installer/utils/system/WindowsNativeUtils.java @@ -364,12 +364,16 @@ return true; } - public File getShortcutLocation(Shortcut shortcut, LocationType locationType) throws NativeException { + public File getShortcutLocation(Shortcut shortcut, LocationType locationType) throws NativeException { + if (shortcut.getPath() != null) { + return new File(shortcut.getPath()); + } + String path = shortcut.getRelativePath(); if (path == null) { - path = ""; + path = ""; } - + String fileName = shortcut.getName(); if(shortcut instanceof FileShortcut) { fileName += ".lnk"; @@ -378,7 +382,7 @@ } final String allUsersRootPath = SystemUtils.getEnvironmentVariable("allusersprofile"); - + File shortcutFile = null; switch (locationType) { case CURRENT_USER_DESKTOP: String userDesktop = registry.getStringValue(HKCU, SHELL_FOLDERS_KEY, "Desktop", false); @@ -386,7 +390,8 @@ userDesktop = SystemUtils.getUserHomeDirectory() + File.separator + "Desktop"; } - return new File(userDesktop, fileName); + shortcutFile = new File(userDesktop, fileName); + break; case ALL_USERS_DESKTOP: String commonDesktop = registry.getStringValue(HKLM, SHELL_FOLDERS_KEY, "Common Desktop", false); @@ -394,7 +399,8 @@ commonDesktop = allUsersRootPath + File.separator + "Desktop"; } - return new File(commonDesktop, fileName); + shortcutFile = new File(commonDesktop, fileName); + break; case CURRENT_USER_START_MENU: String userStartMenu = registry.getStringValue(HKCU, SHELL_FOLDERS_KEY, "Programs", false); @@ -402,7 +408,8 @@ userStartMenu = SystemUtils.getUserHomeDirectory() + File.separator + "Start Menu" + File.separator + "Programs"; } - return new File(userStartMenu, path + File.separator + fileName); + shortcutFile = new File(userStartMenu, path + File.separator + fileName); + break; case ALL_USERS_START_MENU: String commonStartMenu = registry.getStringValue(HKLM, SHELL_FOLDERS_KEY, "Common Programs", false); @@ -410,10 +417,16 @@ commonStartMenu = SystemUtils.getUserHomeDirectory() + File.separator + "Start Menu" + File.separator + "Programs"; } - return new File(commonStartMenu, path + File.separator + fileName); + shortcutFile = new File(commonStartMenu, path + File.separator + fileName); + break; + case CUSTOM: + shortcutFile = new File(path + File.separator + fileName); + break; } - - return null; + if(shortcutFile!=null) { + shortcut.setPath(shortcutFile.getAbsolutePath()); + } + return shortcutFile; } protected void createURLShortcut(InternetShortcut shortcut) throws NativeException { @@ -434,8 +447,6 @@ public File createShortcut(Shortcut shortcut, LocationType locationType) throws NativeException { File shortcutFile = getShortcutLocation(shortcut, locationType); - - shortcut.setPath(shortcutFile.getAbsolutePath()); if(shortcut instanceof FileShortcut) { createShortcut0((FileShortcut)shortcut); } else if(shortcut instanceof InternetShortcut) { @@ -455,6 +466,7 @@ switch (locationType) { case CURRENT_USER_START_MENU: case ALL_USERS_START_MENU: + case CUSTOM: FileUtils.deleteEmptyParents(shortcutFile); break; default: diff --git a/nbi/engine/src/org/netbeans/installer/utils/system/shortcut/LocationType.java b/nbi/engine/src/org/netbeans/installer/utils/system/shortcut/LocationType.java --- a/nbi/engine/src/org/netbeans/installer/utils/system/shortcut/LocationType.java +++ b/nbi/engine/src/org/netbeans/installer/utils/system/shortcut/LocationType.java @@ -44,5 +44,6 @@ CURRENT_USER_DESKTOP, ALL_USERS_DESKTOP, CURRENT_USER_START_MENU, - ALL_USERS_START_MENU + ALL_USERS_START_MENU, + CUSTOM } diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/credits.html b/php.help/javahelp/org/netbeans/modules/php/help/docs/credits.html --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/credits.html +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. +Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved. The contents of this file are subject to the terms of either the GNU @@ -38,8 +38,7 @@

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

Note: Sun is not responsible for the availability of third-party web sites mentioned in this document and does not endorse and is not diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-include-path.html b/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-include-path.html --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-include-path.html +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-include-path.html @@ -8,7 +8,7 @@ http://www.sun.com/ The Original Code is NetBeans. The Initial Developer of the Original -Code is Sun Microsystems, Inc. Portions Copyright 2006 Sun +Code is Sun Microsystems, Inc. Portions Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. If you wish your version of this file to be governed by only the CDDL @@ -118,18 +118,18 @@

 
- - -
-   +   +
-   +   +
-   +   +
diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-run-configuration.html b/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-run-configuration.html --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-run-configuration.html +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-run-configuration.html @@ -8,7 +8,7 @@ http://www.sun.com/ The Original Code is NetBeans. The Initial Developer of the Original -Code is Sun Microsystems, Inc. Portions Copyright 2006 Sun +Code is Sun Microsystems, Inc. Portions Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. If you wish your version of this file to be governed by only the CDDL @@ -142,18 +142,18 @@

- - -
-   +   +
-   +   +
-   +   +
diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-sources.html b/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-sources.html --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-sources.html +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/customize-project-sources.html @@ -8,7 +8,7 @@ http://www.sun.com/ The Original Code is NetBeans. The Initial Developer of the Original -Code is Sun Microsystems, Inc. Portions Copyright 2006 Sun +Code is Sun Microsystems, Inc. Portions Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. If you wish your version of this file to be governed by only the CDDL @@ -100,18 +100,18 @@

- - -
-   +   +
-   +   +
-   +   +
diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/findUsages-CSH.html b/php.help/javahelp/org/netbeans/modules/php/help/docs/findUsages-CSH.html --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/findUsages-CSH.html +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/findUsages-CSH.html @@ -1,6 +1,6 @@ diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/help-about.html b/php.help/javahelp/org/netbeans/modules/php/help/docs/help-about.html --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/help-about.html +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/help-about.html @@ -2,7 +2,7 @@ @@ -91,7 +91,7 @@

For a more detailed description of NetBeans PHP Editor features, please see - + diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/help-map.xml b/php.help/javahelp/org/netbeans/modules/php/help/docs/help-map.xml --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/help-map.xml +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/help-map.xml @@ -10,7 +10,7 @@ http://www.sun.com/ The Original Code is NetBeans. The Initial Developer of the Original -Code is Sun Microsystems, Inc. Portions Copyright 2006 Sun +Code is Sun Microsystems, Inc. Portions Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. If you wish your version of this file to be governed by only the CDDL diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/help-toc.xml b/php.help/javahelp/org/netbeans/modules/php/help/docs/help-toc.xml --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/help-toc.xml +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/help-toc.xml @@ -10,7 +10,7 @@ http://www.sun.com/ The Original Code is NetBeans. The Initial Developer of the Original -Code is Sun Microsystems, Inc. Portions Copyright 2006 Sun +Code is Sun Microsystems, Inc. Portions Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. If you wish your version of this file to be governed by only the CDDL diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-configure_existing_sources.html b/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-configure_existing_sources.html --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-configure_existing_sources.html +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-configure_existing_sources.html @@ -8,7 +8,7 @@ http://www.sun.com/ The Original Code is NetBeans. The Initial Developer of the Original -Code is Sun Microsystems, Inc. Portions Copyright 2006 Sun +Code is Sun Microsystems, Inc. Portions Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. If you wish your version of this file to be governed by only the CDDL @@ -107,18 +107,18 @@

- - -
-   +   +
-   +   +
-   +   +
diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-configure_no_sources.html b/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-configure_no_sources.html --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-configure_no_sources.html +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-configure_no_sources.html @@ -8,7 +8,7 @@ http://www.sun.com/ The Original Code is NetBeans. The Initial Developer of the Original -Code is Sun Microsystems, Inc. Portions Copyright 2006 Sun +Code is Sun Microsystems, Inc. Portions Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. If you wish your version of this file to be governed by only the CDDL @@ -113,18 +113,18 @@

- - -
-   +   +
-   +   +
-   +   +
diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-run-configuration.html b/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-run-configuration.html --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-run-configuration.html +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/new-project-run-configuration.html @@ -8,7 +8,7 @@ http://www.sun.com/ The Original Code is NetBeans. The Initial Developer of the Original -Code is Sun Microsystems, Inc. Portions Copyright 2006 Sun +Code is Sun Microsystems, Inc. Portions Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. If you wish your version of this file to be governed by only the CDDL @@ -290,18 +290,18 @@

- - -
-   +   +
-   +   +
-   +   +
diff --git a/php.help/javahelp/org/netbeans/modules/php/help/docs/phphelp.hs b/php.help/javahelp/org/netbeans/modules/php/help/docs/phphelp.hs --- a/php.help/javahelp/org/netbeans/modules/php/help/docs/phphelp.hs +++ b/php.help/javahelp/org/netbeans/modules/php/help/docs/phphelp.hs @@ -10,7 +10,7 @@ http://www.sun.com/ The Original Code is NetBeans. The Initial Developer of the Original -Code is Sun Microsystems, Inc. Portions Copyright 2006 Sun +Code is Sun Microsystems, Inc. Portions Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. If you wish your version of this file to be governed by only the CDDL diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/credits.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/credits.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/credits.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/credits.html @@ -2,7 +2,7 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_1.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_1.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_1.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_1.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_2.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_2.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_2.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_2.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_2_remote.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_2_remote.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_2_remote.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_2_remote.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_3_integration.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_3_integration.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_3_integration.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_3_integration.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_3_manual.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_3_manual.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_3_manual.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_3_manual.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_4_location.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_4_location.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_4_location.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_4_location.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_5_performint.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_5_performint.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_5_performint.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_5_performint.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_6_reviewadd.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_6_reviewadd.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_6_reviewadd.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_attachwiz_6_reviewadd.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_cpu_options_adv.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_cpu_options_adv.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_cpu_options_adv.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_cpu_options_adv.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_cpu_options_basic.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_cpu_options_basic.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_cpu_options_basic.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_cpu_options_basic.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_custom.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_custom.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_custom.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_custom.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_global.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_global.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_global.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_global.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_quick.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_quick.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_quick.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_filters_quick.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_memory_options_adv.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_memory_options_adv.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_memory_options_adv.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_memory_options_adv.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_memory_options_basic.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_memory_options_basic.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_memory_options_basic.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_memory_options_basic.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_monitor_options_adv.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_monitor_options_adv.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_monitor_options_adv.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_monitor_options_adv.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_monitor_options_basic.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_monitor_options_basic.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_monitor_options_basic.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_monitor_options_basic.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_selecttask.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_selecttask.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_selecttask.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/csh_selecttask.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/options_profiler.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/options_profiler.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/options_profiler.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/options_profiler.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_drilldown.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_drilldown.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_drilldown.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_drilldown.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_heap.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_heap.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_heap.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_heap.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiler.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiler.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiler.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiler.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiling_results_cpu.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiling_results_cpu.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiling_results_cpu.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiling_results_cpu.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiling_results_memory.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiling_results_memory.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiling_results_memory.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profiling_results_memory.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profilingpoints.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profilingpoints.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profilingpoints.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_profilingpoints.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_snap_cpu.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_snap_cpu.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_snap_cpu.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_snap_cpu.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_snap_memory.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_snap_memory.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_snap_memory.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_snap_memory.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_telemetry.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_telemetry.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_telemetry.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_telemetry.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_telemetryoverview.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_telemetryoverview.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_telemetryoverview.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_telemetryoverview.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_threads.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_threads.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_threads.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/csh/view_threads.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/custom_filtersets.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/custom_filtersets.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/custom_filtersets.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/custom_filtersets.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/avgobjage.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/avgobjage.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/avgobjage.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/avgobjage.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/garbagecollection.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/garbagecollection.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/garbagecollection.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/garbagecollection.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/heapdump.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/heapdump.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/heapdump.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/heapdump.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/resultssnapshot.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/resultssnapshot.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/resultssnapshot.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/resultssnapshot.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/rootmethod.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/rootmethod.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/rootmethod.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/rootmethod.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/threadssystem.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/threadssystem.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/threadssystem.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/threadssystem.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/threadsuser.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/threadsuser.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/threadsuser.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/threadsuser.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/trackedobjects.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/trackedobjects.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/trackedobjects.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/glossary/trackedobjects.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/heap_taking.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/heap_taking.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/heap_taking.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/heap_taking.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/heapwalker.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/heapwalker.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/heapwalker.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/heapwalker.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/oqlhelp.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/oqlhelp.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/oqlhelp.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/oqlhelp.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_analyze_short.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_analyze_short.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_analyze_short.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_analyze_short.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_attach.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_attach.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_attach.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_attach.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_freeform.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_freeform.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_freeform.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_freeform.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_memory_short.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_memory_short.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_memory_short.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_memory_short.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_monitor.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_monitor.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_monitor.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_monitor.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_profilepoints.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_profilepoints.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_profilepoints.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_profilepoints.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_quickref.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_quickref.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_quickref.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_quickref.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_remote.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_remote.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_remote.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_remote.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_results.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_results.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_results.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_results.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_rootmethod.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_rootmethod.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_rootmethod.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_rootmethod.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_running.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_running.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_running.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_running.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_startlocal.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_startlocal.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_startlocal.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_startlocal.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_tasks_overview.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_tasks_overview.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_tasks_overview.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_tasks_overview.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_threads.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_threads.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_threads.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_threads.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_windows.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_windows.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_windows.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/profile_windows.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_livefiltering.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_livefiltering.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_livefiltering.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_livefiltering.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_liveresults.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_liveresults.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_liveresults.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_liveresults.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_telemetry.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_telemetry.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_telemetry.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/results_telemetry.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/snap_taking.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/snap_taking.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/snap_taking.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/snap_taking.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/snapshots.html b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/snapshots.html --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/snapshots.html +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/helppages/snapshots.html @@ -1,6 +1,6 @@ diff --git a/profiler/javahelp/org/netbeans/modules/profiler/docs/map.xml b/profiler/javahelp/org/netbeans/modules/profiler/docs/map.xml --- a/profiler/javahelp/org/netbeans/modules/profiler/docs/map.xml +++ b/profiler/javahelp/org/netbeans/modules/profiler/docs/map.xml @@ -2,7 +2,7 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/create_customize_codetemplates.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/create_customize_codetemplates.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/create_customize_codetemplates.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/create_customize_codetemplates.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/credits.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/credits.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/credits.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/editor_shortcuts_codetemplates.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/editor_shortcuts_codetemplates.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/editor_shortcuts_codetemplates.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/editor_shortcuts_codetemplates.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/geminstallationdialog.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/geminstallationdialog.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/geminstallationdialog.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/geminstallationdialog.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/geminstallsettingsdialog.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/geminstallsettingsdialog.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/geminstallsettingsdialog.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/geminstallsettingsdialog.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/gemmanager.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/gemmanager.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/gemmanager.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/gemmanager.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newdbconfig.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newdbconfig.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newdbconfig.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newdbconfig.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwiz-installrails.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwiz-installrails.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwiz-installrails.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwiz-installrails.html @@ -1,5 +1,5 @@ - diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwiz-nameandloc.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwiz-nameandloc.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwiz-nameandloc.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwiz-nameandloc.html @@ -1,5 +1,5 @@ - diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwsourcewiz-nameandloc.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwsourcewiz-nameandloc.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwsourcewiz-nameandloc.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrailsappwsourcewiz-nameandloc.html @@ -1,5 +1,5 @@ - diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwiz-nameandloc.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwiz-nameandloc.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwiz-nameandloc.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwiz-nameandloc.html @@ -1,5 +1,5 @@ - diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwsourcewiz-nameandloc.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwsourcewiz-nameandloc.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwsourcewiz-nameandloc.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwsourcewiz-nameandloc.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwsourcewiz-srcfiles.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwsourcewiz-srcfiles.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwsourcewiz-srcfiles.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/newrubyappwsourcewiz-srcfiles.html @@ -1,5 +1,5 @@ - diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/platformmanager.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/platformmanager.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/platformmanager.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/platformmanager.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/plugininstallsettingsdialog.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/plugininstallsettingsdialog.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/plugininstallsettingsdialog.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/plugininstallsettingsdialog.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railsplugininstallationdialog.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railsplugininstallationdialog.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railsplugininstallationdialog.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railsplugininstallationdialog.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railspluginmanager.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railspluginmanager.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railspluginmanager.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railspluginmanager.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railsprojprops-railsoptions.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railsprojprops-railsoptions.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railsprojprops-railsoptions.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/railsprojprops-railsoptions.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/ruby_quickref.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/ruby_quickref.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/ruby_quickref.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/ruby_quickref.html @@ -1,7 +1,7 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyoptions.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyoptions.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyoptions.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyoptions.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojectnode.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojectnode.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojectnode.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojectnode.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-javaoptions.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-javaoptions.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-javaoptions.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-javaoptions.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-runoptions.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-runoptions.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-runoptions.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-runoptions.html @@ -1,6 +1,6 @@ diff --git a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-sourcesoptions.html b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-sourcesoptions.html --- a/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-sourcesoptions.html +++ b/ruby.help/javahelp/org/netbeans/modules/ruby/help/docs/rubyprojprops-sourcesoptions.html @@ -1,6 +1,6 @@ diff --git a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/about.html b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/about.html --- a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/about.html +++ b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/about.html @@ -1,7 +1,7 @@ diff --git a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/credits.html b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/credits.html --- a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/credits.html +++ b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

The contents of this file are subject to the terms of the Common Development and Distribution License (the License). You may not use this file except in compliance with the License.

You can obtain a copy of the License at http://www.netbeans.org/cddl.html or http://www.netbeans.org/cddl.txt.

When distributing Covered Code, include this CDDL Header Notice in each file and include the License file at http://www.netbeans.org/cddl.txt. If applicable, add the following below the CDDL Header, with the fields enclosed by brackets [] replaced by your own identifying information: "Portions Copyrighted [year] [name of copyright owner]"

-

The Original Software is NetBeans. The Initial Developer of the Original Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.

+

The Original Software is NetBeans. The Initial Developer of the Original Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

Note: Sun is not responsible for the availability of third-party web sites mentioned in this document and does not endorse and is not responsible or liable for any content, advertising, products, or other materials on or available from such sites or resources. Sun will not be responsible or liable for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods, or services available on or through any such sites or resources.

diff --git a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/jdbchelp-map.jhm b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/jdbchelp-map.jhm --- a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/jdbchelp-map.jhm +++ b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/jdbchelp-map.jhm @@ -1,6 +1,6 @@ diff --git a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/jdbchelp.hs b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/jdbchelp.hs --- a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/jdbchelp.hs +++ b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/jdbchelp.hs @@ -1,6 +1,6 @@ diff --git a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/operspecsel.html b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/operspecsel.html --- a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/operspecsel.html +++ b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/operspecsel.html @@ -1,6 +1,6 @@ diff --git a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/tableobjsel.html b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/tableobjsel.html --- a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/tableobjsel.html +++ b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/tableobjsel.html @@ -1,6 +1,6 @@ diff --git a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/wsdlprops.html b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/wsdlprops.html --- a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/wsdlprops.html +++ b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/wizard/wsdlprops.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/credits.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/credits.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/credits.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/credits.html @@ -1,7 +1,7 @@ @@ -14,7 +14,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -37,8 +37,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/pending.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/pending.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/pending.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/pending.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule-toc.xml b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule-toc.xml --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule-toc.xml +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule-toc.xml @@ -1,6 +1,6 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_auth_failed_dialog.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_auth_failed_dialog.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_auth_failed_dialog.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_auth_failed_dialog.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_cert_verification.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_cert_verification.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_cert_verification.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_cert_verification.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_chkout_wizard_p1.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_chkout_wizard_p1.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_chkout_wizard_p1.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_chkout_wizard_p1.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_chkout_wizard_p2.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_chkout_wizard_p2.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_chkout_wizard_p2.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_chkout_wizard_p2.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_copyto_dialog.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_copyto_dialog.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_copyto_dialog.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_copyto_dialog.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_diff_viewer.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_diff_viewer.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_diff_viewer.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_diff_viewer.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_history_viewer.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_history_viewer.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_history_viewer.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_history_viewer.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p1.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p1.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p1.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p1.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p2.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p2.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p2.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p2.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p3.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p3.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p3.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_import_wizard_p3.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_manage_labels.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_manage_labels.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_manage_labels.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_manage_labels.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_merge_dialog.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_merge_dialog.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_merge_dialog.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_merge_dialog.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_merge_resolver.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_merge_resolver.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_merge_resolver.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_merge_resolver.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_options.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_options.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_options.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_options.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_prop_editor.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_prop_editor.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_prop_editor.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_prop_editor.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_relocate_dialog.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_relocate_dialog.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_relocate_dialog.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_relocate_dialog.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_revert_mod_dialog.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_revert_mod_dialog.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_revert_mod_dialog.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_revert_mod_dialog.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_search_rev_dialog.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_search_rev_dialog.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_search_rev_dialog.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_search_rev_dialog.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_switch_dialog.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_switch_dialog.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_switch_dialog.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_switch_dialog.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_versioning_window.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_versioning_window.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_versioning_window.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/csh/svn_versioning_window.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_about.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_about.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_about.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_about.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_branches.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_branches.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_branches.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_branches.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_checkout.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_checkout.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_checkout.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_checkout.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_commit.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_commit.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_commit.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_commit.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_diff.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_diff.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_diff.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_diff.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_histories.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_histories.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_histories.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_histories.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_import.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_import.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_import.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_import.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_merge.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_merge.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_merge.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_merge.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_mergeresolve.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_mergeresolve.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_mergeresolve.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_mergeresolve.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_overview.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_overview.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_overview.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_overview.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_quickref.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_quickref.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_quickref.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_quickref.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_recover_deleted.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_recover_deleted.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_recover_deleted.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_recover_deleted.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_revert.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_revert.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_revert.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_revert.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_setup.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_setup.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_setup.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_setup.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_status.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_status.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_status.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_status.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_updating.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_updating.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_updating.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_updating.html @@ -1,7 +1,7 @@ diff --git a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_using.html b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_using.html --- a/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_using.html +++ b/subversion/javahelp/org/netbeans/modules/subversion/docs/svnmodule/svn_using.html @@ -1,7 +1,7 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_diagrams.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_diagrams.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_diagrams.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_diagrams.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_packages.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_packages.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_packages.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_packages.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_projects.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_projects.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_projects.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/about_projects.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/context_palette.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/context_palette.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/context_palette.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/context_palette.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/contextual_menus_uml_diagram_editor.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/contextual_menus_uml_diagram_editor.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/contextual_menus_uml_diagram_editor.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/contextual_menus_uml_diagram_editor.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/design_windows.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/design_windows.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/design_windows.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/design_windows.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_activity.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_activity.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_activity.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_activity.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_class.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_class.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_class.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_class.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_sequence.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_sequence.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_sequence.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_sequence.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_state.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_state.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_state.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_state.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_use_case.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_use_case.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_use_case.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_components_use_case.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_activity.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_activity.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_activity.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_activity.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_class.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_class.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_class.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_class.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_sequence.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_sequence.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_sequence.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_sequence.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_state.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_state.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_state.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_state.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_use_case.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_use_case.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_use_case.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_types_use_case.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_window_navigation.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_window_navigation.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_window_navigation.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_window_navigation.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_windows.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_windows.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_windows.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/diagram_windows.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/documentation_window.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/documentation_window.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/documentation_window.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/documentation_window.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/documenting_objects.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/documenting_objects.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/documenting_objects.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/documenting_objects.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/navigation_windows.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/navigation_windows.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/navigation_windows.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/navigation_windows.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/palette.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/palette.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/palette.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/palette.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/properties_window.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/properties_window.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/properties_window.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/properties_window.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/source_editor.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/source_editor.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/source_editor.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/source_editor.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/toolbars.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/toolbars.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/toolbars.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/toolbars.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/basics/understanding_projects_diagrams.html b/uml/javahelp/org/netbeans/modules/uml/docs/basics/understanding_projects_diagrams.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/basics/understanding_projects_diagrams.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/basics/understanding_projects_diagrams.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/credits.html b/uml/javahelp/org/netbeans/modules/uml/docs/credits.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/credits.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/about_design_patterns.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/about_design_patterns.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/about_design_patterns.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/about_design_patterns.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/allowing_multiple_participants.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/allowing_multiple_participants.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/allowing_multiple_participants.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/allowing_multiple_participants.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/applying_patterns.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/applying_patterns.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/applying_patterns.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/applying_patterns.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/building_user_defined_patterns.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/building_user_defined_patterns.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/building_user_defined_patterns.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/building_user_defined_patterns.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_diagram_for_user_defined_pattern.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_diagram_for_user_defined_pattern.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_diagram_for_user_defined_pattern.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_diagram_for_user_defined_pattern.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_user_defined_patterns.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_user_defined_patterns.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_user_defined_patterns.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_user_defined_patterns.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_user_defined_projects.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_user_defined_projects.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_user_defined_projects.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/creating_user_defined_projects.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/ejb_design_patterns.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/ejb_design_patterns.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/ejb_design_patterns.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/ejb_design_patterns.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_behavioral_patterns.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_behavioral_patterns.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_behavioral_patterns.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_behavioral_patterns.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_creational_patterns.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_creational_patterns.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_creational_patterns.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_creational_patterns.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_design_patterns.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_design_patterns.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_design_patterns.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_design_patterns.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_structural_patterns.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_structural_patterns.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_structural_patterns.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/gof_structural_patterns.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/inserting_removing_projects.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/inserting_removing_projects.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/inserting_removing_projects.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/inserting_removing_projects.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/promoting_patterns_to_design_center.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/promoting_patterns_to_design_center.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/promoting_patterns_to_design_center.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/promoting_patterns_to_design_center.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/sharing_patterns.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/sharing_patterns.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/sharing_patterns.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/sharing_patterns.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/standard_pattern_projects.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/standard_pattern_projects.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/standard_pattern_projects.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/standard_pattern_projects.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/design/using_design_center.html b/uml/javahelp/org/netbeans/modules/uml/docs/design/using_design_center.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/design/using_design_center.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/design/using_design_center.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_guard_conditions.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_guard_conditions.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_guard_conditions.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_guard_conditions.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_invocations.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_invocations.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_invocations.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_invocations.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_modifying_activity_group_conditions.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_modifying_activity_group_conditions.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_modifying_activity_group_conditions.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_modifying_activity_group_conditions.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_modifying_partition_attributes.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_modifying_partition_attributes.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_modifying_partition_attributes.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_modifying_partition_attributes.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_signal.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_signal.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_signal.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_signal.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_subpartitions.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_subpartitions.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_subpartitions.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_adding_subpartitions.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_connecting_using_activity_edges.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_connecting_using_activity_edges.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_connecting_using_activity_edges.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_connecting_using_activity_edges.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_creating_partitions.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_creating_partitions.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_creating_partitions.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_creating_partitions.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_deleting_subpartitions.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_deleting_subpartitions.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_deleting_subpartitions.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_deleting_subpartitions.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_making_interruptible_activity_group.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_making_interruptible_activity_group.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_making_interruptible_activity_group.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_making_interruptible_activity_group.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_naming_subpartitions.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_naming_subpartitions.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_naming_subpartitions.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_naming_subpartitions.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_invocation_condition.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_invocation_condition.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_invocation_condition.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_invocation_condition.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_modifying_activity_group_groupkind.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_modifying_activity_group_groupkind.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_modifying_activity_group_groupkind.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_modifying_activity_group_groupkind.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_modifying_activity_group_kind.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_modifying_activity_group_kind.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_modifying_activity_group_kind.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_selecting_modifying_activity_group_kind.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_activity_groups.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_activity_groups.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_activity_groups.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_activity_groups.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_interruptible_act_groups_object_nodes.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_interruptible_act_groups_object_nodes.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_interruptible_act_groups_object_nodes.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_interruptible_act_groups_object_nodes.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_invocations_common_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_invocations_common_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_invocations_common_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_invocations_common_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_partitions.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_partitions.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_partitions.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/activity_ww_partitions.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/associate_db.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/associate_db.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/associate_db.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/associate_db.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/associating_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/associating_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/associating_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/associating_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_creating_attributes.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_creating_attributes.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_creating_attributes.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_creating_attributes.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_creating_operations.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_creating_operations.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_creating_operations.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_creating_operations.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_hiding_showing_attributes.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_hiding_showing_attributes.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_hiding_showing_attributes.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_hiding_showing_attributes.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_renaming_attributes.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_renaming_attributes.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_renaming_attributes.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_renaming_attributes.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_renaming_operations.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_renaming_operations.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_renaming_operations.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_renaming_operations.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_reordering_moving_attributes.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_reordering_moving_attributes.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_reordering_moving_attributes.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_reordering_moving_attributes.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_reordering_moving_operations.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_reordering_moving_operations.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_reordering_moving_operations.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_reordering_moving_operations.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_transforming_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_transforming_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_transforming_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_transforming_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_using_compartment_customize_db.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_using_compartment_customize_db.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_using_compartment_customize_db.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_using_compartment_customize_db.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_attributes.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_attributes.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_attributes.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_attributes.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_operations.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_operations.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_operations.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/class_ww_operations.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_dependency.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_dependency.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_dependency.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_dependency.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_from_selected_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_from_selected_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_from_selected_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagram_from_selected_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams_empty.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams_empty.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams_empty.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams_empty.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams_scoped.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams_scoped.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams_scoped.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/creating_diagrams_scoped.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/defining_stereotype_icons.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/defining_stereotype_icons.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/defining_stereotype_icons.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/defining_stereotype_icons.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/deleting_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/deleting_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/deleting_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/deleting_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/deleting_diagrams.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/deleting_diagrams.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/deleting_diagrams.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/deleting_diagrams.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_changing_size.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_changing_size.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_changing_size.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_changing_size.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_copying.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_copying.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_copying.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_copying.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_cutting.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_cutting.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_cutting.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_cutting.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_finding.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_finding.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_finding.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_finding.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_pasting.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_pasting.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_pasting.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_pasting.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_placing.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_placing.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_placing.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_placing.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_renaming.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_renaming.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_renaming.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_renaming.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_selecting_all.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_selecting_all.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_selecting_all.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_selecting_all.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_selecting_all_similar.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_selecting_all_similar.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_selecting_all_similar.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_selecting_all_similar.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_using_redefine_db.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_using_redefine_db.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_using_redefine_db.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/editing_diagram_elements_using_redefine_db.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/generating_code.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/generating_code.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/generating_code.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/generating_code.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_assigning_preset_values.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_assigning_preset_values.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_assigning_preset_values.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_assigning_preset_values.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_assigning_userdef_values.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_assigning_userdef_values.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_assigning_userdef_values.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_assigning_userdef_values.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_showing_hiding_values.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_showing_hiding_values.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_showing_hiding_values.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_showing_hiding_values.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_end_names.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_end_names.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_end_names.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_end_names.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_multiplicity.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_multiplicity.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_multiplicity.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_multiplicity.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_names.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_names.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_names.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/labeling_class_diagram_elements_ww_association_names.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/locking_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/locking_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/locking_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/locking_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/opening_closing.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/opening_closing.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/opening_closing.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/opening_closing.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_creating_interaction_occ_to_nest_diagrams.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_creating_interaction_occ_to_nest_diagrams.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_creating_interaction_occ_to_nest_diagrams.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_creating_interaction_occ_to_nest_diagrams.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_creating_populating_combined_fragments.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_creating_populating_combined_fragments.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_creating_populating_combined_fragments.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_creating_populating_combined_fragments.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_interaction_operators.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_interaction_operators.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_interaction_operators.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_interaction_operators.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_showing_hiding_indicators.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_showing_hiding_indicators.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_showing_hiding_indicators.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_showing_hiding_indicators.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_messagewidth_spacing.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_messagewidth_spacing.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_messagewidth_spacing.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_messagewidth_spacing.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_nowidth_spacing.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_nowidth_spacing.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_nowidth_spacing.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_nowidth_spacing.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_retainminwidth_spacing.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_retainminwidth_spacing.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_retainminwidth_spacing.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_specifying_retainminwidth_spacing.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_combined_fragments.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_combined_fragments.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_combined_fragments.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_combined_fragments.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_element_spacing_restrictions.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_element_spacing_restrictions.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_element_spacing_restrictions.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_element_spacing_restrictions.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_interaction_operand_boxes.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_interaction_operand_boxes.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_interaction_operand_boxes.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/sequence_ww_interaction_operand_boxes.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/source_code_synchronization.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/source_code_synchronization.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/source_code_synchronization.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/source_code_synchronization.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_adding_simple_states.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_adding_simple_states.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_adding_simple_states.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_adding_simple_states.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_connecting_simple_states.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_connecting_simple_states.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_connecting_simple_states.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_connecting_simple_states.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_ww_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_ww_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_ww_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/state_ww_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_actors_use_cases.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_actors_use_cases.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_actors_use_cases.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_actors_use_cases.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_dependencies_extension_points.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_dependencies_extension_points.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_dependencies_extension_points.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_dependencies_extension_points.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_use_case_sub_details.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_use_case_sub_details.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_use_case_sub_details.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/use_case_ww_use_case_sub_details.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/ww_diagrams_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/ww_diagrams_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/ww_diagrams_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/diagrams/ww_diagrams_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/discovering_navigating_links.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/discovering_navigating_links.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/discovering_navigating_links.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/discovering_navigating_links.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/display_drawing_preferences_db.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/display_drawing_preferences_db.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/display_drawing_preferences_db.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/display_drawing_preferences_db.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/filtering_element_types_from_projects_window.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/filtering_element_types_from_projects_window.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/filtering_element_types_from_projects_window.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/filtering_element_types_from_projects_window.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_between_instances_classifiers.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_between_instances_classifiers.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_between_instances_classifiers.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_between_instances_classifiers.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_by_links_in_diagrams.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_by_links_in_diagrams.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_by_links_in_diagrams.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_by_links_in_diagrams.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_diagram_element.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_diagram_element.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_diagram_element.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_diagram_element.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_within_diagrams.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_within_diagrams.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_within_diagrams.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/navigating_within_diagrams.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/specifying_display_drawing_preferences.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/specifying_display_drawing_preferences.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/specifying_display_drawing_preferences.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/specifying_display_drawing_preferences.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/stacking_diagram_elements.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/stacking_diagram_elements.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/stacking_diagram_elements.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/stacking_diagram_elements.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/using_diagram_windows.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/using_diagram_windows.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/using_diagram_windows.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/using_diagram_windows.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/using_overview_window.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/using_overview_window.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/using_overview_window.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/using_overview_window.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/ww_editors_windows.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/ww_editors_windows.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/ww_editors_windows.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/ww_editors_windows.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/zooming_in_diagrams.html b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/zooming_in_diagrams.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/zooming_in_diagrams.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/editors_windows/zooming_in_diagrams.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_guard_condition.html b/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_guard_condition.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_guard_condition.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_guard_condition.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_pseudostate.html b/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_pseudostate.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_pseudostate.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_pseudostate.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_structured_activity_group.html b/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_structured_activity_group.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_structured_activity_group.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/glossary/gloss_structured_activity_group.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/modeling_basics.html b/uml/javahelp/org/netbeans/modules/uml/docs/modeling_basics.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/modeling_basics.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/modeling_basics.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/modeling_features.html b/uml/javahelp/org/netbeans/modules/uml/docs/modeling_features.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/modeling_features.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/modeling_features.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/modeling_introduction.html b/uml/javahelp/org/netbeans/modules/uml/docs/modeling_introduction.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/modeling_introduction.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/modeling_introduction.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/prefs/categories_in_preferences_editor.html b/uml/javahelp/org/netbeans/modules/uml/docs/prefs/categories_in_preferences_editor.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/prefs/categories_in_preferences_editor.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/prefs/categories_in_preferences_editor.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/prefs/configuring_templates_options.html b/uml/javahelp/org/netbeans/modules/uml/docs/prefs/configuring_templates_options.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/prefs/configuring_templates_options.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/prefs/configuring_templates_options.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/prefs/configuring_uml_modeling.html b/uml/javahelp/org/netbeans/modules/uml/docs/prefs/configuring_uml_modeling.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/prefs/configuring_uml_modeling.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/prefs/configuring_uml_modeling.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/prefs/using_preferences_editor.html b/uml/javahelp/org/netbeans/modules/uml/docs/prefs/using_preferences_editor.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/prefs/using_preferences_editor.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/prefs/using_preferences_editor.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/about_java_code_rev_eng.html b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/about_java_code_rev_eng.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/about_java_code_rev_eng.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/about_java_code_rev_eng.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/classes.html b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/classes.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/classes.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/classes.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/exceptions_access_control_modifiers.html b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/exceptions_access_control_modifiers.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/exceptions_access_control_modifiers.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/exceptions_access_control_modifiers.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/interfaces.html b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/interfaces.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/interfaces.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/interfaces.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/launching_rev_eng.html b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/launching_rev_eng.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/launching_rev_eng.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/launching_rev_eng.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/packages.html b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/packages.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/packages.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/packages.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/reference_classes.html b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/reference_classes.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/reference_classes.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/reference_classes.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/reverse_eng_dialog_box.html b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/reverse_eng_dialog_box.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/reverse_eng_dialog_box.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/reverse_eng/reverse_eng_dialog_box.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/round_trip_eng/setting_java_prefs.html b/uml/javahelp/org/netbeans/modules/uml/docs/round_trip_eng/setting_java_prefs.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/round_trip_eng/setting_java_prefs.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/round_trip_eng/setting_java_prefs.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/creating.html b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/creating.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/creating.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/creating.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/deleting.html b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/deleting.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/deleting.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/deleting.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/renaming.html b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/renaming.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/renaming.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/renaming.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/workingwith.html b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/workingwith.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/workingwith.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_packages/workingwith.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/creating_project.html b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/creating_project.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/creating_project.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/creating_project.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/deleting_project.html b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/deleting_project.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/deleting_project.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/deleting_project.html @@ -1,6 +1,6 @@ @@ -32,7 +32,7 @@

 

-Copyright © 2008 Sun Microsystems, Inc. All rights reserved.
+Copyright © 2009 Sun Microsystems, Inc. All rights reserved.
Legal Notices diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/workingwith.html b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/workingwith.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/workingwith.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_projects/workingwith.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_workspace/locating_diagram_components.html b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_workspace/locating_diagram_components.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_workspace/locating_diagram_components.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_workspace/locating_diagram_components.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_workspace/moving_components.html b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_workspace/moving_components.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/tasks_workspace/moving_components.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/tasks_workspace/moving_components.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp-TOC.xml b/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp-TOC.xml --- a/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp-TOC.xml +++ b/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp-TOC.xml @@ -4,7 +4,7 @@ "http://java.sun.com/products/javahelp/toc_2_0.dtd"> diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp.hs b/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp.hs --- a/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp.hs +++ b/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp.hs @@ -4,7 +4,7 @@ "http://java.sun.com/products/javahelp/helpset_2_0.dtd"> diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp.jhm b/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp.jhm --- a/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp.jhm +++ b/uml/javahelp/org/netbeans/modules/uml/docs/uml-javahelp.jhm @@ -4,7 +4,7 @@ "http://java.sun.com/products/javahelp/map_1_0.dtd"> diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/web_reports/generating_model_reports.html b/uml/javahelp/org/netbeans/modules/uml/docs/web_reports/generating_model_reports.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/web_reports/generating_model_reports.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/web_reports/generating_model_reports.html @@ -1,6 +1,6 @@ diff --git a/uml/javahelp/org/netbeans/modules/uml/docs/web_reports/viewing_reports.html b/uml/javahelp/org/netbeans/modules/uml/docs/web_reports/viewing_reports.html --- a/uml/javahelp/org/netbeans/modules/uml/docs/web_reports/viewing_reports.html +++ b/uml/javahelp/org/netbeans/modules/uml/docs/web_reports/viewing_reports.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/Map.jhm b/usersguide/javahelp/org/netbeans/modules/usersguide/Map.jhm --- a/usersguide/javahelp/org/netbeans/modules/usersguide/Map.jhm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/Map.jhm @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/accessibility_home.html b/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/accessibility_home.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/accessibility_home.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/accessibility_home.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/alternate_browser.html b/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/alternate_browser.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/alternate_browser.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/alternate_browser.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/stylesheet.html b/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/stylesheet.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/stylesheet.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/accessibility/stylesheet.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/collab_about.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/collab_about.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/collab_about.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/collab_about.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_create_tracker.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_create_tracker.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_create_tracker.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_create_tracker.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_html_response.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_html_response.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_html_response.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_html_response.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_options.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_options.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_options.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_options.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_patchcontextchooser.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_patchcontextchooser.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_patchcontextchooser.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_patchcontextchooser.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_save_query.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_save_query.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_save_query.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_save_query.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_select_keyword.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_select_keyword.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_select_keyword.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_select_keyword.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_vcs_parameterformat.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_vcs_parameterformat.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_vcs_parameterformat.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/issues_vcs_parameterformat.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/new_kenai_project1.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/new_kenai_project1.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/new_kenai_project1.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/new_kenai_project1.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/new_kenai_project2.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/new_kenai_project2.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/new_kenai_project2.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/new_kenai_project2.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/proj_project_window.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/proj_project_window.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/proj_project_window.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/proj_project_window.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/share_kenai_project.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/share_kenai_project.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/share_kenai_project.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/csh/share_kenai_project.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_about.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_about.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_about.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_about.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_external.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_external.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_external.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_external.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_quickref.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_quickref.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_quickref.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_quickref.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_working.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_working.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_working.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/issues_working.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/kenai_quickref.html b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/kenai_quickref.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/collab/kenai_quickref.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/collab/kenai_quickref.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_about.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_about.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_about.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_about.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_importing.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_importing.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_importing.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_importing.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_options.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_options.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_options.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_options.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_overview.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_overview.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_overview.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_overview.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_quickref.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_quickref.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_quickref.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_quickref.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_startup-switches.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_startup-switches.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_startup-switches.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/configure_startup-switches.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/autoupdate.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/autoupdate.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/autoupdate.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/autoupdate.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_installed.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_installed.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_installed.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_installed.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_newplugs.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_newplugs.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_newplugs.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_newplugs.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_settings.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_settings.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_settings.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_settings.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_updates.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_updates.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_updates.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/csh_plug_updates.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/enablemodule.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/enablemodule.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/enablemodule.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/enablemodule.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/managing_a_module.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/managing_a_module.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/managing_a_module.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/managing_a_module.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/updatecenters.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/updatecenters.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/updatecenters.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/modules/updatecenters.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_diffengine.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_diffengine.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_diffengine.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_diffengine.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_editor.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_editor.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_editor.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_editor.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_file_types.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_file_types.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_file_types.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_file_types.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_fontscolors.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_fontscolors.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_fontscolors.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_fontscolors.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_general.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_general.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_general.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_general.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_todo_settings.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_todo_settings.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_todo_settings.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_todo_settings.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_versioning.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_versioning.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_versioning.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/options_versioning.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/toolbar_commands.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/toolbar_commands.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/toolbar_commands.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/toolbar_commands.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/toolbar_customize.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/toolbar_customize.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/toolbar_customize.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/toolbar_customize.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/window_managing.html b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/window_managing.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/window_managing.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/configure/workspace/window_managing.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/credits.html b/usersguide/javahelp/org/netbeans/modules/usersguide/credits.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/credits.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. +Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved. The contents of this file are subject to the terms of either the GNU @@ -38,8 +38,7 @@

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

Note: Sun is not responsible for the availability of third-party web sites mentioned in this document and does not endorse and is not diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/editing/csh/nav_window.html b/usersguide/javahelp/org/netbeans/modules/usersguide/editing/csh/nav_window.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/editing/csh/nav_window.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/editing/csh/nav_window.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/editing/editor_quickref.html b/usersguide/javahelp/org/netbeans/modules/usersguide/editing/editor_quickref.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/editing/editor_quickref.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/editing/editor_quickref.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/file_encoding.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/file_encoding.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/file_encoding.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/file_encoding.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_diff.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_diff.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_diff.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_diff.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_favorite.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_favorite.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_favorite.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_favorite.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_icons.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_icons.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_icons.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_icons.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_ignore-files.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_ignore-files.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_ignore-files.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_ignore-files.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_properties.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_properties.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_properties.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_properties.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_runtime.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_runtime.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_runtime.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_runtime.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_search.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_search.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_search.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_search.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_template.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_template.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_template.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_template.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_unknown.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_unknown.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_unknown.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/files_unknown.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/find_regexp.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/find_regexp.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/find_regexp.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/find_regexp.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/files/tasklist-csh.html b/usersguide/javahelp/org/netbeans/modules/usersguide/files/tasklist-csh.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/files/tasklist-csh.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/files/tasklist-csh.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/getstart/install_samp_apps.html b/usersguide/javahelp/org/netbeans/modules/usersguide/getstart/install_samp_apps.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/getstart/install_samp_apps.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/getstart/install_samp_apps.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/getstart/welcome.html b/usersguide/javahelp/org/netbeans/modules/usersguide/getstart/welcome.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/getstart/welcome.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/getstart/welcome.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/ide-toc.xml b/usersguide/javahelp/org/netbeans/modules/usersguide/ide-toc.xml --- a/usersguide/javahelp/org/netbeans/modules/usersguide/ide-toc.xml +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/ide-toc.xml @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/ide.css b/usersguide/javahelp/org/netbeans/modules/usersguide/ide.css --- a/usersguide/javahelp/org/netbeans/modules/usersguide/ide.css +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/ide.css @@ -1,7 +1,7 @@ /* * rave.css 08/13/2004 * - * Copyright © 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * * Changes from NetBeans ide.css: diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/ide.hs b/usersguide/javahelp/org/netbeans/modules/usersguide/ide.hs --- a/usersguide/javahelp/org/netbeans/modules/usersguide/ide.hs +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/ide.hs @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/code_completion.html b/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/code_completion.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/code_completion.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/code_completion.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/function_jumping.html b/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/function_jumping.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/function_jumping.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/function_jumping.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/js_basics.html b/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/js_basics.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/js_basics.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/js_basics.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/quickfixes.html b/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/quickfixes.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/quickfixes.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/quickfixes.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/refactoring.html b/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/refactoring.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/refactoring.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/javascript/refactoring.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/csh/hist_diff_viewer.html b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/csh/hist_diff_viewer.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/csh/hist_diff_viewer.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/csh/hist_diff_viewer.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/csh/hist_revert_dialog.html b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/csh/hist_revert_dialog.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/csh/hist_revert_dialog.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/csh/hist_revert_dialog.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_about.html b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_about.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_about.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_about.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_browsing.html b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_browsing.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_browsing.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_browsing.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_quickref.html b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_quickref.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_quickref.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_quickref.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_recovering_deleted.html b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_recovering_deleted.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_recovering_deleted.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_recovering_deleted.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_reverting.html b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_reverting.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_reverting.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_reverting.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_settings.html b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_settings.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_settings.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/local-history/hist_settings.html @@ -1,7 +1,7 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/misc-general/waiting.html b/usersguide/javahelp/org/netbeans/modules/usersguide/misc-general/waiting.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/misc-general/waiting.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/misc-general/waiting.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/pending.html b/usersguide/javahelp/org/netbeans/modules/usersguide/pending.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/pending.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/pending.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/csh_library_manager.html b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/csh_library_manager.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/csh_library_manager.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/csh_library_manager.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_fav_window.html b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_fav_window.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_fav_window.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_fav_window.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_files_window.html b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_files_window.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_files_window.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_files_window.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_group.html b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_group.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_group.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_group.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_project_window.html b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_project_window.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_project_window.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_project_window.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_wiz.html b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_wiz.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_wiz.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/project/csh/proj_wiz.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/project/proj_encoding.html b/usersguide/javahelp/org/netbeans/modules/usersguide/project/proj_encoding.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/project/proj_encoding.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/project/proj_encoding.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/abbreviations-list.html b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/abbreviations-list.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/abbreviations-list.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/abbreviations-list.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/editorcuts.html b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/editorcuts.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/editorcuts.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/editorcuts.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/jhshortcuts.html b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/jhshortcuts.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/jhshortcuts.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/jhshortcuts.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/kybdshortcuts.html b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/kybdshortcuts.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/kybdshortcuts.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/kybdshortcuts.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/mac.html b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/mac.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/mac.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/mac.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/menucuts-setting.html b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/menucuts-setting.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/menucuts-setting.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/menucuts-setting.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/menucuts.html b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/menucuts.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/menucuts.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/menucuts.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/window-navcuts.html b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/window-navcuts.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/window-navcuts.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/shortcuts/window-navcuts.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/tbd.html b/usersguide/javahelp/org/netbeans/modules/usersguide/tbd.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/tbd.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/tbd.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/bypassproxy.html b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/bypassproxy.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/bypassproxy.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/bypassproxy.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/config_browser.html b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/config_browser.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/config_browser.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/config_browser.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/default.html b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/default.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/default.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/default.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/options.html b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/options.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/options.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/options.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/proxy.html b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/proxy.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/proxy.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/proxy.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/webbrowser.html b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/webbrowser.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/webbrowser.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/webbrowser/webbrowser.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/glossary_xmlcatalog.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/glossary_xmlcatalog.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/glossary_xmlcatalog.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/glossary_xmlcatalog.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_about.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_about.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_about.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_about.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_edit.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_edit.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_edit.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_edit.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_formats.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_formats.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_formats.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_formats.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_mount.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_mount.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_mount.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/catalog/xmlcatalog_mount.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_addreference.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_addreference.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_addreference.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_addreference.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_check.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_check.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_check.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_check.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_create.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_create.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_create.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_create.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_edit.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_edit.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_edit.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/css/css_edit.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_create.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_create.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_create.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_create.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_document.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_document.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_document.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_document.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_generatedom.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_generatedom.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_generatedom.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/dtd/dtd_generatedom.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/Oasis_sample.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/Oasis_sample.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/Oasis_sample.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/Oasis_sample.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/XCat_sample.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/XCat_sample.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/XCat_sample.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/XCat_sample.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/XMLCat_sample.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/XMLCat_sample.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/XMLCat_sample.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/samples/XMLCat_sample.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/sax/sax_about.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/sax/sax_about.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/sax/sax_about.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/sax/sax_about.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/sax/sax_generate.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/sax/sax_generate.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/sax/sax_generate.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/sax/sax_generate.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/schema/schemas.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/schema/schemas.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/schema/schemas.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/schema/schemas.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_about.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_about.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_about.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_about.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_check.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_check.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_check.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_check.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_create.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_create.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_create.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_create.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_edit.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_edit.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_edit.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_edit.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_editor-props.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_editor-props.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_editor-props.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_editor-props.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_overview.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_overview.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_overview.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_overview.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_quickref.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_quickref.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_quickref.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_quickref.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_settings.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_settings.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_settings.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_settings.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_validate.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_validate.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_validate.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xml_validate.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xsl/xsl_about.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xsl/xsl_about.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xsl/xsl_about.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xsl/xsl_about.html @@ -1,6 +1,6 @@ diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xsl/xsl_transform.html b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xsl/xsl_transform.html --- a/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xsl/xsl_transform.html +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/xml/xsl/xsl_transform.html @@ -1,6 +1,6 @@ diff --git a/utilities/src/org/netbeans/modules/search/ResultViewPanel.java b/utilities/src/org/netbeans/modules/search/ResultViewPanel.java --- a/utilities/src/org/netbeans/modules/search/ResultViewPanel.java +++ b/utilities/src/org/netbeans/modules/search/ResultViewPanel.java @@ -145,6 +145,7 @@ private final JPanel resultsPanel; private final JToolBar toolBar; + private JSeparator toolbarSeparator; private JButton btnShowDetails = new JButton(); private JButton btnModifySearch = new JButton(); private JButton btnStop = new JButton(); @@ -231,7 +232,7 @@ }); // Toolbar separator - JSeparator toolbarSeparator = new JSeparator(); + toolbarSeparator = new JSeparator(); toolbarSeparator.setOrientation(SwingConstants.VERTICAL); //Buttons panel @@ -286,34 +287,11 @@ JSeparator buttonsPanelSeparator = new JSeparator(); buttonsPanelSeparator.setOrientation(SwingConstants.HORIZONTAL); + add(toolBar, getToolbarConstraints()); + add(toolbarSeparator, getToolbarSeparatorConstraints()); + add(resultsPanel, getMainPanelConstraints()); - GridBagConstraints gridBagConstraints = new GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 0; - gridBagConstraints.gridheight = 3; - gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.weighty = 1.0; - add(toolBar, gridBagConstraints); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 1; - gridBagConstraints.gridy = 0; - gridBagConstraints.gridheight = 3; - gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.weighty = 1.0; - add(toolbarSeparator, gridBagConstraints); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 2; - gridBagConstraints.gridy = 0; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.weightx = 1.0; - gridBagConstraints.weighty = 1.0; - add(resultsPanel, gridBagConstraints); - - gridBagConstraints = new java.awt.GridBagConstraints(); + GridBagConstraints gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 2; gridBagConstraints.gridy = 1; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; @@ -687,8 +665,9 @@ if (issuesPanel != null){ this.issuesPanel = issuesPanel; remove(toolBar); + remove(toolbarSeparator); remove(resultsPanel); - add(issuesPanel, BorderLayout.CENTER); + add(issuesPanel, getMainPanelConstraints()); validate(); repaint(); } @@ -699,14 +678,49 @@ void removeIssuesPanel() { if (issuesPanel != null) { remove(issuesPanel); - add(toolBar, BorderLayout.WEST); - add(resultsPanel, BorderLayout.CENTER); + add(toolBar, getToolbarConstraints()); + add(toolbarSeparator, getToolbarSeparatorConstraints()); + add(resultsPanel, getMainPanelConstraints()); issuesPanel = null; validate(); repaint(); } } + private GridBagConstraints getMainPanelConstraints(){ + GridBagConstraints gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 2; + gridBagConstraints.gridy = 0; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.weighty = 1.0; + + return gridBagConstraints; + } + + private GridBagConstraints getToolbarConstraints(){ + GridBagConstraints gridBagConstraints = new GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 0; + gridBagConstraints.gridheight = 3; + gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.weighty = 1.0; + + return gridBagConstraints; + } + + private GridBagConstraints getToolbarSeparatorConstraints(){ + GridBagConstraints gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 0; + gridBagConstraints.gridheight = 3; + gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.weighty = 1.0; + + return gridBagConstraints; + } /** * Enables or disables the Display Context button, diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/credits.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/credits.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/credits.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/credits.html @@ -1,7 +1,7 @@  @@ -15,7 +15,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -38,8 +38,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule-toc.xml b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule-toc.xml --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule-toc.xml +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule-toc.xml @@ -1,6 +1,6 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_add_var_dialog.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_add_var_dialog.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_add_var_dialog.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_add_var_dialog.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_branch_dialog.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_branch_dialog.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_branch_dialog.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_branch_dialog.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_browsetags_dialog.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_browsetags_dialog.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_browsetags_dialog.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_browsetags_dialog.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_change_root.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_change_root.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_change_root.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_change_root.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkout_wizard_p1.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkout_wizard_p1.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkout_wizard_p1.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkout_wizard_p1.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkout_wizard_p2.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkout_wizard_p2.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkout_wizard_p2.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkout_wizard_p2.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkoutcomplete_dialog.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkoutcomplete_dialog.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkoutcomplete_dialog.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkoutcomplete_dialog.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkoutmodules_dialog.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkoutmodules_dialog.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkoutmodules_dialog.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_chkoutmodules_dialog.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_commit_dialog.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_commit_dialog.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_commit_dialog.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_commit_dialog.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_diff_viewer.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_diff_viewer.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_diff_viewer.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_diff_viewer.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_editroot_dialog.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_editroot_dialog.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_editroot_dialog.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_editroot_dialog.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_history_viewer.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_history_viewer.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_history_viewer.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_history_viewer.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_import_wizard_p1.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_import_wizard_p1.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_import_wizard_p1.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_import_wizard_p1.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_import_wizard_p2.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_import_wizard_p2.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_import_wizard_p2.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_import_wizard_p2.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_merge_resolver.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_merge_resolver.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_merge_resolver.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_merge_resolver.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_mergebranch_dialog.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_mergebranch_dialog.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_mergebranch_dialog.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_mergebranch_dialog.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_options_window.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_options_window.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_options_window.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_options_window.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_switchbranch_dialog.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_switchbranch_dialog.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_switchbranch_dialog.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_switchbranch_dialog.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_tag_dialog.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_tag_dialog.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_tag_dialog.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_tag_dialog.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_versioning_window.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_versioning_window.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_versioning_window.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_versioning_window.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_view_revision_dialog.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_view_revision_dialog.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_view_revision_dialog.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/csh/cvs-lite_view_revision_dialog.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_about.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_about.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_about.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_about.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_branches.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_branches.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_branches.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_branches.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_checkout.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_checkout.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_checkout.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_checkout.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_commit.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_commit.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_commit.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_commit.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_diff.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_diff.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_diff.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_diff.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_histories.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_histories.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_histories.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_histories.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_import.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_import.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_import.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_import.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_merge.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_merge.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_merge.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_merge.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_mergeresolve.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_mergeresolve.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_mergeresolve.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_mergeresolve.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_overview.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_overview.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_overview.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_overview.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_patch.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_patch.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_patch.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_patch.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_quickref.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_quickref.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_quickref.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_quickref.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_recover_deleted.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_recover_deleted.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_recover_deleted.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_recover_deleted.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_reverting.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_reverting.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_reverting.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_reverting.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_settings.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_settings.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_settings.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_settings.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_setup.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_setup.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_setup.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_setup.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_status.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_status.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_status.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_status.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_tagging.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_tagging.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_tagging.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_tagging.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_updating.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_updating.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_updating.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_updating.html @@ -1,7 +1,7 @@ diff --git a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_using.html b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_using.html --- a/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_using.html +++ b/versioning.system.cvss/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule/cvs-lite_using.html @@ -1,7 +1,7 @@ diff --git a/web.examples/src/org/netbeans/modules/web/examples/FoldersListSettings.java b/web.examples/src/org/netbeans/modules/web/examples/FoldersListSettings.java --- a/web.examples/src/org/netbeans/modules/web/examples/FoldersListSettings.java +++ b/web.examples/src/org/netbeans/modules/web/examples/FoldersListSettings.java @@ -50,8 +50,6 @@ private static final String LAST_EXTERNAL_SOURCE_ROOT = "srcRoot"; //NOI18N private static final String NEW_PROJECT_COUNT = "newProjectCount"; //NOI18N -// private static final String SHOW_AGAIN_BROKEN_REF_ALERT = "showAgainBrokenRefAlert"; //NOI18N - public String displayName() { return NbBundle.getMessage (FoldersListSettings.class, "TXT_WebProjectFolderList"); //NOI18N } @@ -76,15 +74,6 @@ getPreferences().putInt(NEW_PROJECT_COUNT, count); } -// public boolean isShowAgainBrokenRefAlert() { -// Boolean b = (Boolean)getProperty(SHOW_AGAIN_BROKEN_REF_ALERT); -// return b == null ? true : b.booleanValue(); -// } -// -// public void setShowAgainBrokenRefAlert(boolean again) { -// this.putProperty(SHOW_AGAIN_BROKEN_REF_ALERT, Boolean.valueOf(again), true); -// } - public static FoldersListSettings getDefault () { return INSTANCE; } diff --git a/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProject.java b/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProject.java --- a/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProject.java +++ b/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProject.java @@ -45,11 +45,9 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; - import javax.swing.JComponent; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; - import org.openide.WizardDescriptor; import org.openide.util.HelpCtx; diff --git a/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.form b/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.form --- a/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.form +++ b/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.form @@ -1,11 +1,15 @@ - + + + + + diff --git a/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.java b/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.java --- a/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.java +++ b/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.java @@ -42,12 +42,11 @@ package org.netbeans.modules.web.examples; import javax.swing.JPanel; - import org.openide.WizardDescriptor; import org.openide.util.HelpCtx; import org.openide.util.NbBundle; -public class PanelConfigureProjectVisual extends JPanel implements HelpCtx.Provider { +class PanelConfigureProjectVisual extends JPanel implements HelpCtx.Provider { private PanelConfigureProject panel; diff --git a/web.examples/src/org/netbeans/modules/web/examples/PanelOptionsVisual.form b/web.examples/src/org/netbeans/modules/web/examples/PanelOptionsVisual.form --- a/web.examples/src/org/netbeans/modules/web/examples/PanelOptionsVisual.form +++ b/web.examples/src/org/netbeans/modules/web/examples/PanelOptionsVisual.form @@ -1,7 +1,15 @@ - + + + + + + + + + @@ -16,7 +24,6 @@ - diff --git a/web.examples/src/org/netbeans/modules/web/examples/PanelOptionsVisual.java b/web.examples/src/org/netbeans/modules/web/examples/PanelOptionsVisual.java --- a/web.examples/src/org/netbeans/modules/web/examples/PanelOptionsVisual.java +++ b/web.examples/src/org/netbeans/modules/web/examples/PanelOptionsVisual.java @@ -41,11 +41,9 @@ package org.netbeans.modules.web.examples; -import org.netbeans.modules.web.api.webmodule.WebModule; import org.openide.WizardDescriptor; -import org.openide.util.NbBundle; -public class PanelOptionsVisual extends javax.swing.JPanel { +class PanelOptionsVisual extends javax.swing.JPanel { private PanelConfigureProject panel; diff --git a/web.examples/src/org/netbeans/modules/web/examples/PanelProjectLocationVisual.form b/web.examples/src/org/netbeans/modules/web/examples/PanelProjectLocationVisual.form --- a/web.examples/src/org/netbeans/modules/web/examples/PanelProjectLocationVisual.form +++ b/web.examples/src/org/netbeans/modules/web/examples/PanelProjectLocationVisual.form @@ -1,19 +1,30 @@ - + + + + + + + + + + + + - + - + @@ -40,13 +51,13 @@ - + - + @@ -70,7 +81,7 @@ - + @@ -91,13 +102,13 @@ - + - + diff --git a/web.examples/src/org/netbeans/modules/web/examples/PanelProjectLocationVisual.java b/web.examples/src/org/netbeans/modules/web/examples/PanelProjectLocationVisual.java --- a/web.examples/src/org/netbeans/modules/web/examples/PanelProjectLocationVisual.java +++ b/web.examples/src/org/netbeans/modules/web/examples/PanelProjectLocationVisual.java @@ -43,17 +43,15 @@ import java.io.File; import java.text.MessageFormat; - import javax.swing.JFileChooser; +import javax.swing.JPanel; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; - import org.netbeans.spi.project.ui.support.ProjectChooser; - import org.openide.WizardDescriptor; import org.openide.util.NbBundle; -public class PanelProjectLocationVisual extends SettingsPanel implements DocumentListener { +class PanelProjectLocationVisual extends JPanel implements DocumentListener { private PanelConfigureProject panel; @@ -61,7 +59,6 @@ public PanelProjectLocationVisual(PanelConfigureProject panel) { initComponents(); this.panel = panel; -// projectNameTextField.setEditable(false); // Register listener on the textFields to make the automatic updates projectNameTextField.getDocument().addDocumentListener(this); @@ -73,7 +70,8 @@ * WARNING: Do NOT modify this code. The content of this method is * always regenerated by the Form Editor. */ - private void initComponents() {//GEN-BEGIN:initComponents + // //GEN-BEGIN:initComponents + private void initComponents() { java.awt.GridBagConstraints gridBagConstraints; projectNameLabel = new javax.swing.JLabel(); @@ -86,31 +84,29 @@ setLayout(new java.awt.GridBagLayout()); - projectNameLabel.setDisplayedMnemonic(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "LBL_NWP1_ProjectName_LabelMnemonic").charAt(0)); + projectNameLabel.setDisplayedMnemonic(java.util.ResourceBundle.getBundle("org/netbeans/modules/web/examples/Bundle").getString("LBL_NWP1_ProjectName_LabelMnemonic").charAt(0)); projectNameLabel.setLabelFor(projectNameTextField); - projectNameLabel.setText(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "LBL_NWP1_ProjectName_Label")); + projectNameLabel.setText(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "LBL_NWP1_ProjectName_Label")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(0, 0, 12, 0); add(projectNameLabel, gridBagConstraints); - gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.weightx = 1.0; gridBagConstraints.insets = new java.awt.Insets(0, 12, 12, 0); add(projectNameTextField, gridBagConstraints); - projectNameTextField.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "ACS_LBL_NWP1_ProjectName_A11YDesc")); + projectNameTextField.getAccessibleContext().setAccessibleDescription("null"); - projectLocationLabel.setDisplayedMnemonic(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "LBL_NWP1_ProjectLocation_LabelMnemonic").charAt(0)); + projectLocationLabel.setDisplayedMnemonic(java.util.ResourceBundle.getBundle("org/netbeans/modules/web/examples/Bundle").getString("LBL_NWP1_ProjectLocation_LabelMnemonic").charAt(0)); projectLocationLabel.setLabelFor(projectLocationTextField); - projectLocationLabel.setText(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "LBL_NWP1_ProjectLocation_Label")); + projectLocationLabel.setText(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "LBL_NWP1_ProjectLocation_Label")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridy = 1; gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(0, 0, 5, 0); add(projectLocationLabel, gridBagConstraints); - gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridy = 1; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; @@ -118,26 +114,25 @@ gridBagConstraints.weightx = 1.0; gridBagConstraints.insets = new java.awt.Insets(0, 12, 5, 0); add(projectLocationTextField, gridBagConstraints); - projectLocationTextField.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "ACS_LBL_NPW1_ProjectLocation_A11YDesc")); + projectLocationTextField.getAccessibleContext().setAccessibleDescription("null"); - Button.setText(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "LBL_NWP1_BrowseLocation_Button")); + Button.setText(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "LBL_NWP1_BrowseLocation_Button")); // NOI18N Button.setActionCommand("BROWSE"); Button.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { browseLocationAction(evt); } }); - gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridy = 1; gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.insets = new java.awt.Insets(0, 6, 5, 0); add(Button, gridBagConstraints); - Button.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "ACS_LBL_NWP1_BrowseLocation_A11YDesc")); + Button.getAccessibleContext().setAccessibleDescription("null"); - createdFolderLabel.setDisplayedMnemonic(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "LBL_NWP1_CreatedProjectFolder_LablelMnemonic").charAt(0)); + createdFolderLabel.setDisplayedMnemonic(java.util.ResourceBundle.getBundle("org/netbeans/modules/web/examples/Bundle").getString("LBL_NWP1_CreatedProjectFolder_LablelMnemonic").charAt(0)); createdFolderLabel.setLabelFor(createdFolderTextField); - createdFolderLabel.setText(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "LBL_NWP1_CreatedProjectFolder_Lablel")); + createdFolderLabel.setText(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "LBL_NWP1_CreatedProjectFolder_Lablel")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridheight = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; @@ -153,9 +148,8 @@ gridBagConstraints.weighty = 1.0; gridBagConstraints.insets = new java.awt.Insets(0, 12, 0, 0); add(createdFolderTextField, gridBagConstraints); - createdFolderTextField.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(PanelProjectLocationVisual.class, "ACS_LBL_NWP1_CreatedProjectFolder_A11YDesc")); - - }//GEN-END:initComponents + createdFolderTextField.getAccessibleContext().setAccessibleDescription("null"); + }// //GEN-END:initComponents private void browseLocationAction(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseLocationAction String command = evt.getActionCommand(); @@ -252,14 +246,6 @@ protected javax.swing.JTextField projectNameTextField; // End of variables declaration//GEN-END:variables - private static JFileChooser createChooser() { - JFileChooser chooser = new JFileChooser(); - chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); - chooser.setAcceptAllFileFilterUsed(false); - - return chooser; - } - private String validFreeProjectName(final File parentFolder, final String formater, final int index) { String name = MessageFormat.format(formater, new Object[] {new Integer (index)}); File file = new File(parentFolder, name); diff --git a/web.examples/src/org/netbeans/modules/web/examples/SettingsPanel.java b/web.examples/src/org/netbeans/modules/web/examples/SettingsPanel.java deleted file mode 100644 --- a/web.examples/src/org/netbeans/modules/web/examples/SettingsPanel.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * Contributor(s): - * - * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun - * Microsystems, Inc. All Rights Reserved. - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - */ - -package org.netbeans.modules.web.examples; - -import javax.swing.JPanel; -import org.openide.WizardDescriptor; - - -abstract class SettingsPanel extends JPanel { - - abstract void store (WizardDescriptor settings); - - abstract void read (WizardDescriptor settings); - - abstract boolean valid (WizardDescriptor settings); -} diff --git a/web.examples/src/org/netbeans/modules/web/examples/WebSampleProjectGenerator.java b/web.examples/src/org/netbeans/modules/web/examples/WebSampleProjectGenerator.java --- a/web.examples/src/org/netbeans/modules/web/examples/WebSampleProjectGenerator.java +++ b/web.examples/src/org/netbeans/modules/web/examples/WebSampleProjectGenerator.java @@ -42,7 +42,6 @@ package org.netbeans.modules.web.examples; import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -51,7 +50,6 @@ import java.util.zip.ZipInputStream; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.openide.filesystems.FileLock; - import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; import org.openide.xml.XMLUtil; diff --git a/web.examples/src/org/netbeans/modules/web/examples/WebSampleProjectIterator.java b/web.examples/src/org/netbeans/modules/web/examples/WebSampleProjectIterator.java --- a/web.examples/src/org/netbeans/modules/web/examples/WebSampleProjectIterator.java +++ b/web.examples/src/org/netbeans/modules/web/examples/WebSampleProjectIterator.java @@ -1,7 +1,42 @@ /* - * Main.java + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Created on April 6, 2004, 3:39 PM + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * Contributor(s): + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun + * Microsystems, Inc. All Rights Reserved. + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. */ package org.netbeans.modules.web.examples; diff --git a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/credits.html b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/credits.html --- a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/credits.html +++ b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor-toc.xml b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor-toc.xml --- a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor-toc.xml +++ b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor-toc.xml @@ -1,6 +1,6 @@ diff --git a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/display.html b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/display.html --- a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/display.html +++ b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/display.html @@ -1,6 +1,6 @@ diff --git a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/process.html b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/process.html --- a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/process.html +++ b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/process.html @@ -1,6 +1,6 @@ diff --git a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/resend.html b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/resend.html --- a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/resend.html +++ b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/resend.html @@ -1,6 +1,6 @@ diff --git a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/store.html b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/store.html --- a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/store.html +++ b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/store.html @@ -1,6 +1,6 @@ diff --git a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/view.html b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/view.html --- a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/view.html +++ b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitor/view.html @@ -1,6 +1,6 @@ diff --git a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitorMap.jhm b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitorMap.jhm --- a/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitorMap.jhm +++ b/web.monitor/javahelp/org/netbeans/modules/web/monitor/docs/monitorMap.jhm @@ -1,6 +1,6 @@ diff --git a/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/credits.html b/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/credits.html --- a/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/credits.html +++ b/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/refreshing-cached-refs.html b/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/refreshing-cached-refs.html --- a/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/refreshing-cached-refs.html +++ b/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/refreshing-cached-refs.html @@ -1,6 +1,6 @@ diff --git a/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/using-cpr.html b/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/using-cpr.html --- a/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/using-cpr.html +++ b/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/using-cpr.html @@ -1,6 +1,6 @@ diff --git a/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/ww-projectreferences.html b/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/ww-projectreferences.html --- a/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/ww-projectreferences.html +++ b/xml.catalogsupport/javahelp/org/netbeans/modules/xml/catalogsupport/docs/ww-projectreferences.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/about.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/about.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/about.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/about.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/credits.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/credits.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/credits.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/attribute.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/attribute.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/attribute.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/attribute.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/complextype.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/complextype.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/complextype.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/complextype.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/documentation.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/documentation.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/documentation.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/documentation.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/element.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/element.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/element.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/element.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/import-customizer.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/import-customizer.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/import-customizer.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/import-customizer.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/import.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/import.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/import.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/import.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/include-customizer.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/include-customizer.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/include-customizer.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/include-customizer.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/include.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/include.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/include.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/include.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/redefine-customizer.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/redefine-customizer.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/redefine-customizer.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/redefine-customizer.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/redefine.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/redefine.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/redefine.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/redefine.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/reference.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/reference.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/reference.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/reference.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/simpletype.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/simpletype.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/simpletype.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/customizers/simpletype.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/about.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/about.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/about.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/about.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/addingcomponents.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/addingcomponents.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/addingcomponents.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/addingcomponents.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/editingcomponents.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/editingcomponents.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/editingcomponents.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/editingcomponents.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/palette.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/palette.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/palette.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/designview/palette.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/about.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/about.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/about.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/about.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/addingcomponents.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/addingcomponents.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/addingcomponents.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/addingcomponents.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/editingcomponents.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/editingcomponents.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/editingcomponents.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/editingcomponents.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/findingusages.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/findingusages.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/findingusages.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/findingusages.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/usingfind.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/usingfind.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/usingfind.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/schemaview/usingfind.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingannotation.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingannotation.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingannotation.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingannotation.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingattributegroup.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingattributegroup.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingattributegroup.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingattributegroup.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingcompositors.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingcompositors.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingcompositors.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingcompositors.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingdocumentation.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingdocumentation.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingdocumentation.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingdocumentation.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingenumeration.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingenumeration.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingenumeration.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingenumeration.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalattribute.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalattribute.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalattribute.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalattribute.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalcomplextype.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalcomplextype.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalcomplextype.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalcomplextype.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalelement.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalelement.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalelement.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalelement.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalsimpletype.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalsimpletype.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalsimpletype.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingglobalsimpletype.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinggroup.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinggroup.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinggroup.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinggroup.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingimport.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingimport.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingimport.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingimport.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinginclude.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinginclude.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinginclude.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinginclude.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalattribute.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalattribute.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalattribute.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalattribute.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalcomplextype.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalcomplextype.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalcomplextype.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalcomplextype.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalelement.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalelement.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalelement.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalelement.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalsimpletype.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalsimpletype.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalsimpletype.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addinglocalsimpletype.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingredefine.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingredefine.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingredefine.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingredefine.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingreference.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingreference.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingreference.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/addingreference.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/analyzingschemas.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/analyzingschemas.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/analyzingschemas.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/analyzingschemas.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/applyingdesignpatterns.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/applyingdesignpatterns.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/applyingdesignpatterns.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/applyingdesignpatterns.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/creatingxmlschema.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/creatingxmlschema.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/creatingxmlschema.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/creatingxmlschema.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/editingxmlschema.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/editingxmlschema.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/editingxmlschema.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/editingxmlschema.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingderivationsofglobct.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingderivationsofglobct.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingderivationsofglobct.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingderivationsofglobct.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingsubstgroups.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingsubstgroups.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingsubstgroups.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingsubstgroups.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingunusedcomponents.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingunusedcomponents.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingunusedcomponents.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/findingunusedcomponents.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/referencingextschemas.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/referencingextschemas.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/referencingextschemas.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/referencingextschemas.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/retrievingxmlresources.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/retrievingxmlresources.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/retrievingxmlresources.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/retrievingxmlresources.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-multi-schemas.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-multi-schemas.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-multi-schemas.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-multi-schemas.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-oneschema.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-oneschema.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-oneschema.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-oneschema.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-xml-catalog.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-xml-catalog.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-xml-catalog.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion-xml-catalog.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingcodecompletion.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingrefactoringforrenamedelete.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingrefactoringforrenamedelete.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingrefactoringforrenamedelete.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/usingrefactoringforrenamedelete.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/validatingxmlschema.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/validatingxmlschema.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/validatingxmlschema.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/validatingxmlschema.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/views_navigation.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/views_navigation.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/views_navigation.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/tasks/views_navigation.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_navigator.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_navigator.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_navigator.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_navigator.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlrefactoring.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlrefactoring.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlrefactoring.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlrefactoring.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlschemaquery.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlschemaquery.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlschemaquery.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlschemaquery.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlusages.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlusages.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlusages.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/windows/window_xmlusages.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/wiz/wiz_newxmlschema.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/wiz/wiz_newxmlschema.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/wiz/wiz_newxmlschema.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/wiz/wiz_newxmlschema.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/wiz/wiz_retrieveschemawsdl.html b/xml.schema/javahelp/org/netbeans/modules/xml/schema/wiz/wiz_retrieveschemawsdl.html --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/wiz/wiz_retrieveschemawsdl.html +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/wiz/wiz_retrieveschemawsdl.html @@ -1,6 +1,6 @@ diff --git a/xml.schema/javahelp/org/netbeans/modules/xml/schema/xmltools-javahelp-toc.xml b/xml.schema/javahelp/org/netbeans/modules/xml/schema/xmltools-javahelp-toc.xml --- a/xml.schema/javahelp/org/netbeans/modules/xml/schema/xmltools-javahelp-toc.xml +++ b/xml.schema/javahelp/org/netbeans/modules/xml/schema/xmltools-javahelp-toc.xml @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/create_new_operation.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/create_new_operation.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/create_new_operation.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/create_new_operation.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/create_new_port_type.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/create_new_port_type.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/create_new_port_type.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/create_new_port_type.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/element_or_type.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/element_or_type.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/element_or_type.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/element_or_type.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/generate_binding_service_port.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/generate_binding_service_port.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/generate_binding_service_port.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/generate_binding_service_port.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_define_abstract.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_define_abstract.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_define_abstract.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_define_abstract.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_define_concrete.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_define_concrete.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_define_concrete.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_define_concrete.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_name_location.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_name_location.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_name_location.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/new_wsdl_wizard_name_location.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/wsdlui-wsdlview-showusages.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/wsdlui-wsdlview-showusages.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/wsdlui-wsdlview-showusages.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/CSH/wsdlui-wsdlview-showusages.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_FTP.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_FTP.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_FTP.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_FTP.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_HTTP.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_HTTP.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_HTTP.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_HTTP.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_SOAP.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_SOAP.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_SOAP.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/binding_subtype_SOAP.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/credits.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/credits.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/credits.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

-

Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

+

Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.

The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common @@ -36,8 +36,7 @@

Contributor(s):

The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -Microsystems, Inc. All Rights Reserved.

+Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_bindings.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_bindings.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_bindings.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_bindings.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_bpel_ext.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_bpel_ext.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_bpel_ext.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_bpel_ext.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_code_completion.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_code_completion.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_code_completion.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_code_completion.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_config.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_config.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_config.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_config.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_creating.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_creating.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_creating.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_creating.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_creating_existing.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_creating_existing.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_creating_existing.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_creating_existing.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_data_types.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_data_types.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_data_types.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_data_types.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_documentation.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_documentation.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_documentation.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_documentation.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_find.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_find.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_find.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_find.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_import_schema.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_import_schema.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_import_schema.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_import_schema.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_import_wsdl.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_import_wsdl.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_import_wsdl.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_import_wsdl.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_messages.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_messages.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_messages.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_messages.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_ncname.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_ncname.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_ncname.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_ncname.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_layout.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_layout.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_layout.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_layout.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_messages.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_messages.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_messages.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_messages.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_messages_editing.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_messages_editing.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_messages_editing.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_messages_editing.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_nav.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_nav.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_nav.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_nav.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_top_bottom.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_top_bottom.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_top_bottom.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_top_bottom.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_types.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_types.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_types.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_types.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_types_editing.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_types_editing.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_types_editing.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_partner_types_editing.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_port_types.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_port_types.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_port_types.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_port_types.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_prop.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_prop.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_prop.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_prop.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_refactoring.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_refactoring.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_refactoring.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_refactoring.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_root.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_root.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_root.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_root.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_services.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_services.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_services.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_services.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_source.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_source.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_source.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_source.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_validation.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_validation.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_validation.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_validation.html @@ -1,6 +1,6 @@ diff --git a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_views.html b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_views.html --- a/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_views.html +++ b/xml.wsdlui/javahelp/org/netbeans/modules/xml/wsdlui/docs/wsdl_editor_views.html @@ -1,6 +1,6 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/about.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/about.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/about.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/about.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/credits.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/credits.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/credits.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/credits.html @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@

The contents of this file are subject to the terms of the Common Development and Distribution License (the License). You may not use this file except in compliance with the License.

You can obtain a copy of the License at http://www.netbeans.org/cddl.html or http://www.netbeans.org/cddl.txt.

When distributing Covered Code, include this CDDL Header Notice in each file and include the License file at http://www.netbeans.org/cddl.txt. If applicable, add the following below the CDDL Header, with the fields enclosed by brackets [] replaced by your own identifying information: "Portions Copyrighted [year] [name of copyright owner]"

-

The Original Software is NetBeans. The Initial Developer of the Original Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.

+

The Original Software is NetBeans. The Initial Developer of the Original Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.

Note: Sun is not responsible for the availability of third-party web sites mentioned in this document and does not endorse and is not responsible or liable for any content, advertising, products, or other materials on or available from such sites or resources. Sun will not be responsible or liable for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods, or services available on or through any such sites or resources.

\ No newline at end of file diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/about.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/about.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/about.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/about.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/about.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/about.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/about.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/about.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/about.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/about.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/about.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/about.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/boolean.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/boolean.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/boolean.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/boolean.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/nodes.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/nodes.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/nodes.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/nodes.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/number.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/number.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/number.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/number.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/operator.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/operator.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/operator.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/operator.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/string.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/string.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/string.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/palette/string.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/about.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/about.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/about.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/about.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/predicates.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/predicates.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/predicates.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/predicates.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/simplemap.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/simplemap.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/simplemap.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/simplemap.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/xpath.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/xpath.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/xpath.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/panel/xpath.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/sourcetree.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/sourcetree.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/sourcetree.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/sourcetree.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/target/about.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/target/about.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/target/about.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/target/about.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/target/rules.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/target/rules.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/target/rules.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/design/target/rules.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/source.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/source.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/source.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/source.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/xpath.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/xpath.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/xpath.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/editor/xpath.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/about.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/about.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/about.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/about.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/addxsl.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/addxsl.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/addxsl.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/addxsl.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/build.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/build.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/build.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/build.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/create.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/create.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/create.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/create.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/deploy.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/deploy.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/deploy.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/deploy.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/properties.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/properties.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/properties.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/properties.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/test.html b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/test.html --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/test.html +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/project/test.html @@ -1,7 +1,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-idx.xml b/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-idx.xml --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-idx.xml +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-idx.xml @@ -2,7 +2,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-map.jhm b/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-map.jhm --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-map.jhm +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-map.jhm @@ -2,7 +2,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-toc.xml b/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-toc.xml --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-toc.xml +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp-toc.xml @@ -2,7 +2,7 @@ diff --git a/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp.hs b/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp.hs --- a/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp.hs +++ b/xslt.help/javahelp/org/netbeans/modules/xslt/help/xslthelp.hs @@ -1,6 +1,6 @@ + + + + + diff --git a/o.n.bootstrap/src/org/netbeans/Stamps.java b/o.n.bootstrap/src/org/netbeans/Stamps.java --- a/o.n.bootstrap/src/org/netbeans/Stamps.java +++ b/o.n.bootstrap/src/org/netbeans/Stamps.java @@ -91,6 +91,15 @@ stamp(false); return; } + if (args.length == 1 && "init".equals(args[0])) { // NOI18N + moduleJARs = null; + stamp(true); + return; + } + if (args.length == 1 && "clear".equals(args[0])) { // NOI18N + moduleJARs = null; + return; + } } private static final Stamps MODULES_JARS = new Stamps(); /** Creates instance of stamp that checks timestamp for all files that affect @@ -359,35 +368,46 @@ File configDir = new File(new File(cluster, "config"), "Modules"); // NOI18N File modulesDir = new File(cluster, "modules"); // NOI18N - - highestStampForDir(configDir, result); - highestStampForDir(modulesDir, result); + + AtomicLong clusterResult = new AtomicLong(); + if (highestStampForDir(configDir, clusterResult) && highestStampForDir(modulesDir, clusterResult)) { + // ok + } else { + if (!cluster.isDirectory()) { + // skip non-existing clusters` + return; + } + } + + if (clusterResult.longValue() > result.longValue()) { + result.set(clusterResult.longValue()); + } if (createStampFile) { try { stamp.getParentFile().mkdirs(); stamp.createNewFile(); - stamp.setLastModified(result.longValue()); + stamp.setLastModified(clusterResult.longValue()); } catch (IOException ex) { System.err.println("Cannot write timestamp to " + stamp); // NOI18N } } } - private static void highestStampForDir(File file, AtomicLong result) { + private static boolean highestStampForDir(File file, AtomicLong result) { File[] children = file.listFiles(); if (children == null) { long time = file.lastModified(); if (time > result.longValue()) { result.set(time); } - return; + return false; } for (File f : children) { highestStampForDir(f, result); } - + return true; } private static boolean compareAndUpdateFile(File file, String content, AtomicLong result) { diff --git a/o.n.bootstrap/test/unit/src/org/netbeans/StampsExtraTest.java b/o.n.bootstrap/test/unit/src/org/netbeans/StampsExtraTest.java new file mode 100644 --- /dev/null +++ b/o.n.bootstrap/test/unit/src/org/netbeans/StampsExtraTest.java @@ -0,0 +1,137 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2008 Sun Microsystems, Inc. + */ + +package org.netbeans; + +import java.io.File; +import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; +import junit.framework.Test; +import org.netbeans.junit.NbTestCase; +import org.netbeans.junit.NbTestSuite; + +/** + * + * @author Jaroslav Tulach + */ +public class StampsExtraTest extends NbTestCase { + private File userdir; + private File ide; + private File platform; + private File install; + private File extra; + + + public static Test suite() { + //return new StampsTest("testStampsInvalidatedWhenClustersChange"); + return new NbTestSuite(StampsExtraTest.class); + } + + public StampsExtraTest(String testName) { + super(testName); + } + + public void testTimeStampsWhenAddingCluster() throws Exception { + clearWorkDir(); + + install = new File(getWorkDir(), "install"); + platform = new File(install, "platform7"); + platform.mkdirs(); + ide = new File(install, "ide8"); + ide.mkdirs(); + extra = new File(install, "extra"); + userdir = new File(getWorkDir(), "tmp"); + userdir.mkdirs(); + + System.setProperty("netbeans.home", platform.getPath()); + System.setProperty("netbeans.dirs", ide.getPath() + File.pathSeparator + extra.getPath()); + System.setProperty("netbeans.user", userdir.getPath()); + + touch(platform, ".lastModified", 50000L); + touch(ide, ".lastModified", 90000L); + assertFalse("One cluster does not exists", extra.isDirectory()); + + Stamps.main("init"); + + Thread.sleep(100); + + Logger l = Logger.getLogger("org"); + l.setLevel(Level.OFF); + l.setUseParentHandlers(false); + + long stamp = Stamps.moduleJARs(); + assertEquals("Timestamp is taken from api.languages module", 90000L, stamp); + + Stamps.main("clear"); + + CountingSecurityManager.initialize(install.getPath()); + + long newStamp = Stamps.moduleJARs(); + + CountingSecurityManager.assertCounts("Just few accesses to installation", 6); + assertEquals("Stamps are the same", stamp, newStamp); + + File lastModifiedDir = new File(new File(new File(userdir, "var"), "cache"), "lastModified"); + File extraLM = new File(lastModifiedDir, "extra"); + assertFalse("File has not been created for non-existing cluster", extraLM.canRead()); + + extra.mkdirs(); + File lastModified = new File(extra, ".lastModified"); + lastModified.createNewFile(); + lastModified.setLastModified(200000L); + assertEquals("Correct last modified", 200000L, lastModified.lastModified()); + + Stamps.main("clear"); + stamp = Stamps.moduleJARs(); + if (stamp < 200000L) { + fail("lastModified has not been updated: " + stamp); + } + } + + private static void touch(File root, String rel, long time) throws IOException { + File f = new File(root, rel.replace('/', File.separatorChar)); + if (!f.exists()) { + f.getParentFile().mkdirs(); + f.createNewFile(); + } + f.setLastModified(time); + assertEquals("Correct last modified for " + f, time, f.lastModified()); + } +} diff --git a/o.n.bootstrap/test/unit/src/org/netbeans/StampsIdeLessThanPlatformTest.java b/o.n.bootstrap/test/unit/src/org/netbeans/StampsIdeLessThanPlatformTest.java new file mode 100644 --- /dev/null +++ b/o.n.bootstrap/test/unit/src/org/netbeans/StampsIdeLessThanPlatformTest.java @@ -0,0 +1,111 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2008 Sun Microsystems, Inc. + */ + +package org.netbeans; + +import java.io.File; +import java.util.logging.Level; +import java.util.logging.Logger; +import junit.framework.Test; +import org.netbeans.junit.NbTestCase; +import org.netbeans.junit.NbTestSuite; + +/** + * + * @author Jaroslav Tulach + */ +public class StampsIdeLessThanPlatformTest extends NbTestCase { + private File userdir; + private File ide; + private File platform; + private File install; + + + public static Test suite() { + //return new StampsTest("testStampsInvalidatedWhenClustersChange"); + return new NbTestSuite(StampsIdeLessThanPlatformTest.class); + } + + public StampsIdeLessThanPlatformTest(String testName) { + super(testName); + } + + @Override + protected void setUp() throws Exception { + clearWorkDir(); + + install = new File(getWorkDir(), "install"); + platform = new File(install, "platform7"); + ide = new File(install, "ide8"); + userdir = new File(getWorkDir(), "tmp"); + + System.setProperty("netbeans.home", platform.getPath()); + System.setProperty("netbeans.dirs", ide.getPath()); + System.setProperty("netbeans.user", userdir.getPath()); + + StampsTest.createModule("org.openide.awt", platform, 50000L); + StampsTest.createModule("org.openide.nodes", platform, 60000L); + StampsTest.createModule("org.netbeans.api.languages", ide, 50000L); + StampsTest.createModule("org.netbeans.modules.logmanagement", userdir, 10000L); + + Stamps.main("reset"); + + Thread.sleep(100); + + Logger l = Logger.getLogger("org"); + l.setLevel(Level.OFF); + l.setUseParentHandlers(false); + } + + @Override + protected void tearDown() throws Exception { + super.tearDown(); + } + + public void testGenerateTimeStamps() { + long stamp = Stamps.moduleJARs(); + assertEquals("Timestamp is taken from nodes module", 60000L, stamp); + + StampsTest.assertStamp(60000L, platform, false, true); + StampsTest.assertStamp(50000L, ide, false, true); + StampsTest.assertStamp(-1L, userdir, false, false); + } + + +} diff --git a/o.n.bootstrap/test/unit/src/org/netbeans/StampsTest.java b/o.n.bootstrap/test/unit/src/org/netbeans/StampsTest.java --- a/o.n.bootstrap/test/unit/src/org/netbeans/StampsTest.java +++ b/o.n.bootstrap/test/unit/src/org/netbeans/StampsTest.java @@ -45,7 +45,6 @@ import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.MappedByteBuffer; -import java.util.LinkedList; import java.util.concurrent.Semaphore; import java.util.logging.Level; import java.util.logging.Logger; @@ -558,9 +557,9 @@ } } } - - - private static void assertStamp(long expectedValue, File cluster, boolean global, boolean local) { + + + static void assertStamp(long expectedValue, File cluster, boolean global, boolean local) { File globalStamp = new File(cluster, ".lastModified"); File userDir = new File(System.getProperty("netbeans.user")); @@ -582,7 +581,7 @@ } - private void createModule(String cnb, File cluster, long accesTime) throws IOException { + static void createModule(String cnb, File cluster, long accesTime) throws IOException { String dashes = cnb.replace('.', '-'); File config = new File(new File(new File(cluster, "config"), "Modules"), dashes + ".xml"); diff --git a/o.n.core/arch.xml b/o.n.core/arch.xml --- a/o.n.core/arch.xml +++ b/o.n.core/arch.xml @@ -514,6 +514,12 @@ The context field is accessed from editor module by reflection from MultiKeymap. + + The module expects profiler to provide SelfProfileAction + and interacts with it as described in + profiler/test/unit/src/org/netbeans/modules/profiler/actions/SelfSamplerActionTest.java + test. +

diff --git a/o.n.core/src/org/netbeans/core/Bundle.properties b/o.n.core/src/org/netbeans/core/Bundle.properties --- a/o.n.core/src/org/netbeans/core/Bundle.properties +++ b/o.n.core/src/org/netbeans/core/Bundle.properties @@ -179,3 +179,9 @@ # NbAuthenticatorPanel NbAuthenticatorPanel.userNameLbl.text=&User Name: NbAuthenticatorPanel.passwordLbl.text=&Password: + +# TimableEventQueue +TEQ_LowPerformance=System slowness detected +# {0} time in ms +# {1} time in s +TEQ_BlockedFor=Not reponsive for {0,choice,0#{0} ms|5000#{1} s}. \ No newline at end of file diff --git a/o.n.core/src/org/netbeans/core/TimableEventQueue.java b/o.n.core/src/org/netbeans/core/TimableEventQueue.java --- a/o.n.core/src/org/netbeans/core/TimableEventQueue.java +++ b/o.n.core/src/org/netbeans/core/TimableEventQueue.java @@ -42,15 +42,32 @@ import java.awt.AWTEvent; import java.awt.EventQueue; import java.awt.Toolkit; -import java.util.EmptyStackException; -import java.util.Map; -import java.util.ResourceBundle; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.LinkedList; +import java.util.Queue; import java.util.logging.Level; -import java.util.logging.LogRecord; import java.util.logging.Logger; +import javax.swing.Action; import org.netbeans.core.startup.Main; +import org.openide.awt.Notification; +import org.openide.awt.NotificationDisplayer; +import org.openide.filesystems.FileObject; +import org.openide.filesystems.FileUtil; +import org.openide.loaders.DataObject; +import org.openide.nodes.Node; +import org.openide.util.ContextAwareAction; +import org.openide.util.Exceptions; +import org.openide.util.ImageUtilities; import org.openide.util.Mutex; +import org.openide.util.NbBundle; import org.openide.util.RequestProcessor; +import org.openide.util.lookup.Lookups; +import org.openide.windows.WindowManager; /** * Logging event queue that can report problems about too long execution times @@ -62,19 +79,20 @@ implements Runnable { private static final Logger LOG = Logger.getLogger(TimableEventQueue.class.getName()); private static final RequestProcessor RP = new RequestProcessor("Timeable Event Queue Watch Dog", 1, true); // NOI18N - private static final int QUANTUM = Integer.getInteger("org.netbeans.core.TimeableEventQueue.quantum", 5000); // NOI18N - private static final int PAUSE = Integer.getInteger("org.netbeans.core.TimeableEventQueue.pause", 60000); // NOI18N + private static final int QUANTUM = Integer.getInteger("org.netbeans.core.TimeableEventQueue.quantum", 100); // NOI18N + private static final int REPORT = Integer.getInteger("org.netbeans.core.TimeableEventQueue.report", 1000); // NOI18N + private static final int PAUSE = Integer.getInteger("org.netbeans.core.TimeableEventQueue.pause", 15000); // NOI18N - private final RequestProcessor.Task TIMEOUT; - private volatile Map stack; private volatile long ignoreTill; private volatile long start; - + private volatile ActionListener stoppable; + private final Queue pending; public TimableEventQueue() { TIMEOUT = RP.create(this); TIMEOUT.setPriority(Thread.MIN_PRIORITY); + pending = new LinkedList(); } static void initialize() { @@ -97,74 +115,86 @@ e.printStackTrace(); } } + @Override protected void dispatchEvent(AWTEvent event) { try { - tick(); + tick("dispatchEvent"); // NOI18N super.dispatchEvent(event); } finally { done(); } } - @Override - public void postEvent(AWTEvent theEvent) { - try { - tick(); - super.postEvent(theEvent); - } finally { - done(); - } - } - - @Override - public synchronized void push(EventQueue newEventQueue) { - try { - tick(); - super.push(newEventQueue); - } finally { - done(); - } - } - private void done() { - stack = null; TIMEOUT.cancel(); long time = System.currentTimeMillis() - start; - if (time > 50) { - LOG.log(Level.FINE, "done, timer stopped, took {0}", time); + if (time > QUANTUM) { + LOG.log(Level.FINE, "done, timer stopped, took {0}", time); // NOI18N + if (time > REPORT) { + LOG.log(Level.WARNING, "too much time in AWT thread {0}", stoppable); // NOI18N + ActionListener ss = stoppable; + if (ss != null) { + try { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + DataOutputStream dos = new DataOutputStream(out); + ss.actionPerformed(new ActionEvent(dos, 0, "write")); // NOI18N + dos.close(); + pending.add(new NotifySnapshot(out.toByteArray(), time)); + if (pending.size() > 5) { + pending.remove().clear(); + } + stoppable = null; + } catch (Exception ex) { + Exceptions.printStackTrace(ex); + } + ignoreTill = System.currentTimeMillis() + PAUSE; + } + } } else { LOG.log(Level.FINEST, "done, timer stopped, took {0}", time); } + ActionListener ss = stoppable; + if (ss != null) { + ss.actionPerformed(new ActionEvent(this, 0, "cancel")); // NOI18N + stoppable = null; + } + return; } - private void tick() { - stack = null; + private void tick(String name) { start = System.currentTimeMillis(); - if (start >= ignoreTill) { - LOG.log(Level.FINEST, "tick, schedule a timer at {0}", start); + if (start >= ignoreTill && WindowManager.getDefault().getMainWindow().isShowing()) { + LOG.log(Level.FINEST, "tick, schedule a timer for {0}", name); TIMEOUT.schedule(QUANTUM); } } public void run() { - stack = Thread.getAllStackTraces(); - LOG.log(Level.FINER, "timer running"); - for (int i = 0; i < 10; i++) { - if (Thread.interrupted()) { - LOG.log(Level.FINER, "timer cancelled"); - return; - } - Thread.yield(); - System.gc(); - System.runFinalization(); - } - final Map myStack = stack; - if (myStack == null) { - LOG.log(Level.FINER, "timer cancelled"); + if (stoppable != null) { + LOG.log(Level.WARNING, "Still previous controller {0}", stoppable); return; } - + Runnable selfSampler = (Runnable)createSelfSampler(); + if (selfSampler != null) { + selfSampler.run(); + stoppable = (ActionListener)selfSampler; + } + } + + private static Object createSelfSampler() { + FileObject fo = FileUtil.getConfigFile("Actions/Profile/org-netbeans-modules-profiler-actions-SelfSamplerAction.instance"); + if (fo == null) { + return null; + } + Action a = (Action)fo.getAttribute("delegate"); // NOI18N + if (a == null) { + return null; + } + return a.getValue("logger-awt"); // NOI18N + } + + /* long now = System.currentTimeMillis(); ignoreTill = now + PAUSE; long howLong = now - start; @@ -179,7 +209,7 @@ // UI_LOG.log(rec); LOG.log(rec); } - + private static final class EQException extends Exception { private volatile Map stack; @@ -243,4 +273,41 @@ } } + */ + + private static final class NotifySnapshot implements ActionListener { + private final byte[] content; + private final Notification note; + + NotifySnapshot(byte[] arr, long time) { + content = arr; + note = NotificationDisplayer.getDefault().notify( + NbBundle.getMessage(NotifySnapshot.class, "TEQ_LowPerformance"), + ImageUtilities.loadImageIcon("org/netbeans/core/resources/vilik.png", true), + NbBundle.getMessage(NotifySnapshot.class, "TEQ_BlockedFor", time, time / 1000), + this, NotificationDisplayer.Priority.LOW + ); + } + + public void actionPerformed(ActionEvent e) { + try { + FileObject fo = FileUtil.createMemoryFileSystem().getRoot().createData("slow.nps"); + OutputStream os = fo.getOutputStream(); + os.write(content); + os.close(); + final Node obj = DataObject.find(fo).getNodeDelegate(); + Action a = obj.getPreferredAction(); + if (a instanceof ContextAwareAction) { + a = ((ContextAwareAction)a).createContextAwareInstance(Lookups.singleton(obj)); + } + a.actionPerformed(e); + } catch (IOException ex) { + Exceptions.printStackTrace(ex); + } + } + + public void clear() { + note.clear(); + } + } } diff --git a/o.n.core/src/org/netbeans/core/resources/vilik.png b/o.n.core/src/org/netbeans/core/resources/vilik.png new file mode 100644 index 0000000000000000000000000000000000000000..bacd931f5face49bdb50845a35c1396e88b21af8 GIT binary patch literal 876 zc$@)j1C#uTP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2iXN0 z2oM21cdWAj000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0008VNkl3nvV2lz)9wLg)KrK^gdntX;LT~B4vndhX5dY*PCnx#O`Sa&L5?>$z z^?(7W0z5#B6(BC_e*+T0x*|DKoEre4*js=SzPY-Dr+^>mD=|un4sKBt#Jakw`i_nr zCq+q2b$9RT>FXPN45&*a;af@P&;RP(zf-xAT`=y==b}@?|A>#fkNcZ?d;13iflUqD zxBb2^7>ub!^_t-;Ig%v#{q1*~n;SQpOr?az{;I8X#oN7J^Bbqr(x$4pXd;o3T(0sx z(P(N!*Y)sn53pD)Cb!%DQ+c@)S(Y&vojA%^1-f48l+|c7sh&Q4pkrwG^4~pwwELC} zVqJrMO=rM&RuF_zB^FX6k%+0Kr3K?c3{}$>pFMl8xZO5WXlh37I?{S%{QX4YW^exx zfZ+95>#tq$KW}T>T7{M-mrFA+S_O#^N+^TSEs_^ z*&zVw&vV;;?(7U4M&1sE7zRP1)|Eyqna5mvhMCy~c_I1Ypw*c1RFrA9L%XXz^V!@{ zU!x;FJQ{mxFq_LX#0n@VphW;k&EU}$h8Iv}i+^$qJCCXdV7WwV(Ao@$G4I+9TlgrSkqSkJo;@sBGmScYbx zvY5b9;5ML1-?3mGSPjTP8Ylp%?@_Syd}6UwK>r`!qzkE&Kr99T0000= 0; - } - assertTrue("Slow is in the stack trace", found); } private static final class CountingHandler extends Handler { diff --git a/openide.loaders/src/org/openide/loaders/FolderInstance.java b/openide.loaders/src/org/openide/loaders/FolderInstance.java --- a/openide.loaders/src/org/openide/loaders/FolderInstance.java +++ b/openide.loaders/src/org/openide/loaders/FolderInstance.java @@ -46,13 +46,13 @@ import java.beans.PropertyChangeEvent; import java.io.IOException; import java.util.*; +import java.util.concurrent.Callable; import java.util.logging.Level; import java.util.logging.Logger; import org.netbeans.modules.openide.loaders.AWTTask; import org.openide.filesystems.*; import org.openide.cookies.InstanceCookie; -import org.openide.util.Exceptions; import org.openide.util.Task; import org.openide.util.TaskListener; import org.openide.util.RequestProcessor; @@ -415,6 +415,7 @@ InstanceCookie cookie; //Order of checking reversed first check cookie and then folder // test if we accept the instance + // XXX for subtle reasons, current test fails if this is changed to getLookup: cookie = dob.getCookie(InstanceCookie.class); try { cookie = cookie == null ? null : acceptCookie (cookie); @@ -422,10 +423,12 @@ } catch (IOException ex) { // an error during a call to acceptCookie err.log(Level.WARNING, null, ex); + revertProblematicFile(dob); cookie = null; } catch (ClassNotFoundException ex) { // an error during a call to acceptCookie - err.log(Level.WARNING, null, ex); + err.log(Level.INFO, null, ex); + revertProblematicFile(dob); cookie = null; } @@ -459,6 +462,16 @@ return cookie; } + private void revertProblematicFile(DataObject dob) { + Object rw = dob.getPrimaryFile().getAttribute("removeWritables"); // NOI18N + if (rw instanceof Callable) { + try { + ((Callable) rw).call(); + } catch (Exception x) { + err.log(Level.INFO, null, x); + } + } + } /** Allows subclasses to decide whether they want to work with * the specified InstanceCookie or not. diff --git a/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java b/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java --- a/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java +++ b/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java @@ -39,7 +39,9 @@ package org.netbeans.performance.scalability; +import java.io.File; import java.io.FileDescriptor; +import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; import java.security.Permission; @@ -48,6 +50,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicLong; import junit.framework.Assert; +import org.openide.util.Exceptions; /** * @@ -78,6 +81,12 @@ msgs = new StringWriter(); pw = new PrintWriter(msgs); CountingSecurityManager.prefix = prefix; + try { + CountingSecurityManager.prefix = new File(prefix).getCanonicalPath(); + } catch (IOException ex) { + Exceptions.printStackTrace(ex); + } + System.err.println("setting prefix to " + CountingSecurityManager.prefix); Statistics.reset(); } diff --git a/performance/test/unit/src/org/netbeans/performance/scalability/ExpandFolderTest.java b/performance/test/unit/src/org/netbeans/performance/scalability/ExpandFolderTest.java --- a/performance/test/unit/src/org/netbeans/performance/scalability/ExpandFolderTest.java +++ b/performance/test/unit/src/org/netbeans/performance/scalability/ExpandFolderTest.java @@ -79,6 +79,7 @@ Configuration config = NbModuleSuite.createConfiguration(ExpandFolderTest.class) .clusters(clusters) .enableModules(modules) + .honorAutoloadEager(true) .gui(false); return NbModuleSuite.create(config); } diff --git a/profiler/src/org/netbeans/modules/profiler/actions/SelfSamplerAction.java b/profiler/src/org/netbeans/modules/profiler/actions/SelfSamplerAction.java --- a/profiler/src/org/netbeans/modules/profiler/actions/SelfSamplerAction.java +++ b/profiler/src/org/netbeans/modules/profiler/actions/SelfSamplerAction.java @@ -42,13 +42,18 @@ import java.awt.Toolkit; import java.awt.event.AWTEventListener; import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.awt.event.KeyEvent; +import java.io.DataOutputStream; +import java.nio.channels.WritableByteChannel; import java.util.Collections; +import java.util.concurrent.Callable; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicReference; import javax.swing.AbstractAction; import javax.swing.Action; import org.netbeans.lib.profiler.common.ProfilingSettingsPresets; @@ -56,6 +61,7 @@ import org.netbeans.lib.profiler.results.cpu.StackTraceSnapshotBuilder; import org.netbeans.modules.profiler.LoadedSnapshot; import org.netbeans.modules.profiler.ResultsManager; +import org.openide.util.Exceptions; import org.openide.util.ImageUtilities; import org.openide.util.NbBundle; @@ -74,12 +80,7 @@ private static final String ACTION_NAME_STOP = NbBundle.getMessage(SelfSamplerAction.class, "SelfSamplerAction_ActionNameStop"); // private static final String ACTION_DESCR = NbBundle.getMessage(SelfSamplerAction.class, "SelfSamplerAction_ActionDescription"); private static final String THREAD_NAME = NbBundle.getMessage(SelfSamplerAction.class, "SelfSamplerAction_ThreadName"); - private StackTraceSnapshotBuilder builder; - private ThreadFactory threadFactory; - private ScheduledExecutorService executor; - - private AtomicBoolean isRunning = new AtomicBoolean(false); - private long startTime; + private final AtomicReference RUNNING = new AtomicReference(); //~ Constructors ------------------------------------------------------------------------------------------------------------- private SelfSamplerAction() { @@ -101,24 +102,6 @@ //~ Methods ------------------------------------------------------------------------------------------------------------------ - /** - * @return the builder - */ - private synchronized StackTraceSnapshotBuilder getBuilder() { - if (builder == null) { - builder = new StackTraceSnapshotBuilder(); - threadFactory = new ThreadFactory() { - public Thread newThread(Runnable r) { - return new Thread(r, THREAD_NAME); - } - }; - builder.setIgnoredThreads(Collections.singleton(THREAD_NAME)); - } - return builder; - } - - - @Override public boolean isEnabled() { return true; @@ -128,42 +111,23 @@ * Invoked when an action occurs. */ public void actionPerformed(final ActionEvent e) { - if (isRunning.compareAndSet(false, true)) { + Controller c; + if (RUNNING.compareAndSet(null, c = new Controller(THREAD_NAME))) { putValue(Action.NAME, ACTION_NAME_STOP); putValue(Action.SMALL_ICON, ImageUtilities.loadImageIcon( "org/netbeans/modules/profiler/actions/resources/modifyProfiling.png" //NOI18N - , false) + , false) ); - final StackTraceSnapshotBuilder b = getBuilder(); - executor = Executors.newSingleThreadScheduledExecutor(threadFactory); - startTime = System.currentTimeMillis(); - executor.scheduleAtFixedRate(new Runnable() { - public void run() { - b.addStacktrace(Thread.getAllStackTraces(), System.nanoTime()); - } - }, 10, 10, TimeUnit.MILLISECONDS); - } else if (isRunning.compareAndSet(true, false)) { + c.run(); + } else if ((c = RUNNING.getAndSet(null)) != null) { putValue(Action.NAME, ACTION_NAME_START); putValue(Action.SMALL_ICON, ImageUtilities.loadImageIcon( "org/netbeans/modules/profiler/actions/resources/openSnapshot.png" //NOI18N - , false) + , false) ); - try { - executor.shutdown(); - executor.awaitTermination(100, TimeUnit.MILLISECONDS); - CPUResultsSnapshot snapshot = getBuilder().createSnapshot(startTime, System.nanoTime()); - LoadedSnapshot loadedSnapshot = new LoadedSnapshot(snapshot, ProfilingSettingsPresets.createCPUPreset(), null, null); - loadedSnapshot.setSaved(true); - ResultsManager.getDefault().openSnapshot(loadedSnapshot); - getBuilder().reset(); - - } catch (CPUResultsSnapshot.NoDataAvailableException ex) { - ex.printStackTrace(); - } catch (InterruptedException ex) { - Thread.currentThread().interrupt(); - } + c.actionPerformed(new ActionEvent(this, 0, "show")); // NOI18N } } @@ -176,5 +140,75 @@ } } + @Override + public Object getValue(String key) { + Object o = super.getValue(key); + if (o == null && key.startsWith("logger-")) { // NOI18N + return new Controller(key); + } + return o; + } + + + private static final class Controller implements Runnable, ActionListener { + private final String name; + private StackTraceSnapshotBuilder builder; + private ThreadFactory threadFactory; + private ScheduledExecutorService executor; + private long startTime; + + public Controller(String n) { + name = n; + } + /** + * @return the builder + */ + private synchronized StackTraceSnapshotBuilder getBuilder() { + if (builder == null) { + builder = new StackTraceSnapshotBuilder(); + threadFactory = new ThreadFactory() { + public Thread newThread(Runnable r) { + return new Thread(r, name); + } + }; + builder.setIgnoredThreads(Collections.singleton(name)); + } + return builder; + } + + public void run() { + final StackTraceSnapshotBuilder b = getBuilder(); + executor = Executors.newSingleThreadScheduledExecutor(threadFactory); + startTime = System.currentTimeMillis(); + executor.scheduleAtFixedRate(new Runnable() { + public void run() { + b.addStacktrace(Thread.getAllStackTraces(), System.nanoTime()); + } + }, 10, 10, TimeUnit.MILLISECONDS); + } + + public void actionPerformed(ActionEvent e) { + try { + executor.shutdown(); + executor.awaitTermination(100, TimeUnit.MILLISECONDS); + if ("cancel".equals(e.getActionCommand())) { + return; + } + CPUResultsSnapshot snapshot = getBuilder().createSnapshot(startTime, System.nanoTime()); + LoadedSnapshot loadedSnapshot = new LoadedSnapshot(snapshot, ProfilingSettingsPresets.createCPUPreset(), null, null); + if ("write".equals(e.getActionCommand())) { + DataOutputStream dos = (DataOutputStream)e.getSource(); + loadedSnapshot.save(dos); + return; + } + loadedSnapshot.setSaved(true); + ResultsManager.getDefault().openSnapshot(loadedSnapshot); + } catch (Exception ex) { + Exceptions.printStackTrace(ex); + } finally { + getBuilder().reset(); + } + } + } } diff --git a/profiler/test/unit/src/org/netbeans/modules/profiler/actions/SelfSamplerActionTest.java b/profiler/test/unit/src/org/netbeans/modules/profiler/actions/SelfSamplerActionTest.java new file mode 100644 --- /dev/null +++ b/profiler/test/unit/src/org/netbeans/modules/profiler/actions/SelfSamplerActionTest.java @@ -0,0 +1,137 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.profiler.actions; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.DataOutputStream; +import java.io.OutputStream; +import java.util.logging.Level; +import javax.swing.Action; +import org.junit.Test; +import org.netbeans.junit.Log; +import org.netbeans.modules.profiler.ui.NpsDataObject; +import org.openide.cookies.OpenCookie; +import org.openide.filesystems.FileObject; +import org.openide.filesystems.FileUtil; +import org.openide.loaders.DataObject; +import static org.junit.Assert.*; + +/** Shows how o.n.core uses the SelfSamplerAction to start and stop self profiling. + * + * @author Jaroslav Tulach + */ +public class SelfSamplerActionTest { + + public SelfSamplerActionTest() { + } + + @Test + public void testSelfProfileToStream() throws Exception { + FileObject afo = FileUtil.getConfigFile("Actions/Profile/org-netbeans-modules-profiler-actions-SelfSamplerAction.instance"); + assertNotNull("SelfSamplerAction is in the right fileobject", afo); + Action a = (Action)afo.getAttribute("delegate"); // NOI18N + Object obj = a.getValue("logger-testprofile"); + assertTrue("It is runnable", obj instanceof Runnable); + assertTrue("It is action listener", obj instanceof ActionListener); + + Runnable r = (Runnable)obj; + ActionListener al = (ActionListener)obj; + + r.run(); + Thread.sleep(1000); + assertLoggerThread("logger-testprofile shall be there", true); + + FileObject fo = FileUtil.createMemoryFileSystem().getRoot().createData("slow.nps"); + OutputStream os = fo.getOutputStream(); + DataOutputStream dos = new DataOutputStream(os); + al.actionPerformed(new ActionEvent(dos, 0, "write")); // NOI18N + dos.close(); + + if (fo.getSize() < 100) { + fail("The file shall have real content: " + fo.getSize()); + } + + DataObject dataObject = DataObject.find(fo); + assertEquals("Nps DataObject", NpsDataObject.class, dataObject.getClass()); + OpenCookie oc = dataObject.getLookup().lookup(OpenCookie.class); + assertNotNull("Open cookie exists", oc); + + CharSequence log = Log.enable("", Level.WARNING); + oc.open(); + + if (log.length() > 0) { + fail("There shall be no warnings:\n" + log); + } + + assertLoggerThread("no logger- thread shall be there", false); + } + + @Test + public void testSelfProfileCancel() throws Exception { + SelfSamplerAction result = SelfSamplerAction.getInstance(); + Object obj = result.getValue("logger-testprofile"); + assertTrue("It is runnable", obj instanceof Runnable); + assertTrue("It is action listener", obj instanceof ActionListener); + + Runnable r = (Runnable)obj; + ActionListener al = (ActionListener)obj; + + r.run(); + Thread.sleep(1000); + assertLoggerThread("logger-testprofile shall be there", true); + + al.actionPerformed(new ActionEvent(this, 0, "cancel")); // NOI18N + + assertLoggerThread("no logger- thread shall be there", false); + } + + private void assertLoggerThread(String msg, boolean exist) { + for (Thread t : Thread.getAllStackTraces().keySet()) { + if (t.getName().startsWith("logger-")) { + assertTrue(msg + "There is " + t.getName() + " thread", exist); + return; + } + } + assertFalse(msg + "There is no logger- thread", exist); + } + + +} \ No newline at end of file diff --git a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindSubclassesTest.java b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindSubclassesTest.java --- a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindSubclassesTest.java +++ b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindSubclassesTest.java @@ -56,7 +56,6 @@ import org.netbeans.junit.Log; import org.netbeans.junit.NbModuleSuite; import org.netbeans.junit.NbPerformanceTest; -import org.netbeans.modules.refactoring.api.Problem; import org.netbeans.modules.refactoring.api.RefactoringElement; import org.netbeans.modules.refactoring.api.RefactoringSession; import org.netbeans.modules.refactoring.api.WhereUsedQuery; @@ -102,7 +101,6 @@ timer = Logger.getLogger("TIMER.RefactoringPrepare"); timer.setLevel(Level.FINE); timer.addHandler(getHandler()); - ClasspathInfo cp = ClasspathInfo.create(boot, compile, source); Log.enableInstances(Logger.getLogger("TIMER"), "JavacParser", Level.FINEST); FileObject testFile = getProjectDir().getFileObject("/src/simplej2seapp/Main.java"); @@ -121,7 +119,8 @@ ClasspathInfo cpi = RetoucheUtils.getClasspathInfoFor(TreePathHandle.create(object, controller)); wuq[0].getContext().add(cpi); } - }, false); + }, false).get(); + wuq[0].putValue(WhereUsedQueryConstants.FIND_SUBCLASSES, true); RefactoringSession rs = RefactoringSession.create("Session"); wuq[0].prepare(rs); @@ -130,8 +129,8 @@ StringBuilder sb = new StringBuilder(); sb.append("Symbol: '").append(symbolName[0]).append("'"); sb.append('\n').append("Number of usages: ").append(elems.size()).append('\n'); - long prepare = getHandler().get("refactoring.prepare"); try { + long prepare = getHandler().get("refactoring.prepare"); NbPerformanceTest.PerformanceData d = new NbPerformanceTest.PerformanceData(); d.name = "refactoring.prepare"+" (" + symbolName[0] + ", usages:" + elems.size() + ")"; d.value = prepare; @@ -152,6 +151,6 @@ } public static Test suite() throws InterruptedException { - return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(FindSubclassesTest.class, "testFindSub").gui(true)); + return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(FindSubclassesTest.class, "testFindSub").gui(false)); } } \ No newline at end of file diff --git a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindUsagesPerfTest.java b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindUsagesPerfTest.java --- a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindUsagesPerfTest.java +++ b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindUsagesPerfTest.java @@ -90,7 +90,7 @@ // find usages of symbols collected below final List handle = new ArrayList(); - src.runUserActionTask(new Task() { + src.runWhenScanFinished(new Task() { public void run(CompilationController controller) throws Exception { controller.toPhase(JavaSource.Phase.RESOLVED); @@ -99,12 +99,12 @@ handle.add(TreePathHandle.create(element, controller)); } } - }, false); + }, false).get(); // do find usages query for (final TreePathHandle element : handle) { - src.runUserActionTask(new Task() { + src.runWhenScanFinished(new Task() { public void run(CompilationController controller) throws Exception { controller.toPhase(JavaSource.Phase.RESOLVED); @@ -140,7 +140,7 @@ System.err.println(sb); } - }, false); + }, false).get(); System.gc(); System.gc(); } src = null; diff --git a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/MoveClassPerfTest.java b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/MoveClassPerfTest.java --- a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/MoveClassPerfTest.java +++ b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/MoveClassPerfTest.java @@ -92,7 +92,7 @@ final MoveRefactoring[] moveRef = new MoveRefactoring[1]; final CharSequence REFACTORED_OBJ = "org.gjt.sp.jedit.ActionSet"; - src.runUserActionTask(new Task() { + src.runWhenScanFinished(new Task() { public void run(CompilationController controller) throws Exception { controller.toPhase(JavaSource.Phase.RESOLVED); @@ -101,7 +101,7 @@ ClasspathInfo cpi = RetoucheUtils.getClasspathInfoFor(TreePathHandle.create(klass, controller)); moveRef[0].getContext().add(cpi); } - }, false); + }, false).get(); RefactoringSession rs = RefactoringSession.create("Session"); File f = FileUtil.toFile(getProjectDir().getFileObject("/src/org/gjt/sp")); @@ -136,6 +136,6 @@ } public static Test suite() throws InterruptedException { - return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(MoveClassPerfTest.class, "testMoveActionSet").gui(true)); + return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(MoveClassPerfTest.class, "testMoveActionSet").gui(false)); } } \ No newline at end of file diff --git a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/OpenDocumentsPerfTest.java b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/OpenDocumentsPerfTest.java --- a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/OpenDocumentsPerfTest.java +++ b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/OpenDocumentsPerfTest.java @@ -55,8 +55,6 @@ import org.netbeans.junit.Log; import org.netbeans.junit.NbModuleSuite; import org.netbeans.junit.NbPerformanceTest; -import org.netbeans.modules.java.source.usages.ClassIndexManager; -import org.netbeans.modules.refactoring.api.Problem; import org.netbeans.modules.refactoring.api.RefactoringElement; import org.netbeans.modules.refactoring.api.RefactoringSession; import org.netbeans.modules.refactoring.api.WhereUsedQuery; @@ -146,6 +144,6 @@ } public static Test suite() throws InterruptedException { - return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(OpenDocumentsPerfTest.class, "testOpenDocuments").gui(true)); + return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(OpenDocumentsPerfTest.class, "testOpenDocuments").gui(false)); } } \ No newline at end of file # HG changeset patch # User Marek Fukala # Date 1244020517 -7200 # Node ID 8afa0b1bc1d360cad0c1b165b1bb6fc03cc125b2 # Parent 1b68bfc60f02a7a5c335cd3a234438fe80d2b5af fixing incorrect assertion usage - embedding are incorrectly created w/o assertions enabled diff --git a/javascript.editing/src/org/netbeans/modules/javascript/editing/embedding/JsEmbeddingProvider.java b/javascript.editing/src/org/netbeans/modules/javascript/editing/embedding/JsEmbeddingProvider.java --- a/javascript.editing/src/org/netbeans/modules/javascript/editing/embedding/JsEmbeddingProvider.java +++ b/javascript.editing/src/org/netbeans/modules/javascript/editing/embedding/JsEmbeddingProvider.java @@ -583,7 +583,8 @@ //need to adjust the last embedding //1. remove the embedding from the list - assert embeddings.remove(state.lastInlinedJavscriptEmbedding); + boolean removed = embeddings.remove(state.lastInlinedJavscriptEmbedding); + assert removed; //2. create new embedding with the adjusted length embeddings.add(snapshot.create(sourceStart, sourceLength, JsTokenId.JAVASCRIPT_MIME_TYPE)); # HG changeset patch # User Marek Fukala # Date 1244020972 -7200 # Node ID 5ae5c863ede48e408fe75b1baa65311cff6da9b2 # Parent e908977366afe24bbb797872eeee5f5589e138a2 # Parent 8afa0b1bc1d360cad0c1b165b1bb6fc03cc125b2 Automated merge with http://hg.netbeans.org/web-main diff --git a/javascript.editing/src/org/netbeans/modules/javascript/editing/embedding/JsEmbeddingProvider.java b/javascript.editing/src/org/netbeans/modules/javascript/editing/embedding/JsEmbeddingProvider.java --- a/javascript.editing/src/org/netbeans/modules/javascript/editing/embedding/JsEmbeddingProvider.java +++ b/javascript.editing/src/org/netbeans/modules/javascript/editing/embedding/JsEmbeddingProvider.java @@ -583,7 +583,8 @@ //need to adjust the last embedding //1. remove the embedding from the list - assert embeddings.remove(state.lastInlinedJavscriptEmbedding); + boolean removed = embeddings.remove(state.lastInlinedJavscriptEmbedding); + assert removed; //2. create new embedding with the adjusted length embeddings.add(snapshot.create(sourceStart, sourceLength, JsTokenId.JAVASCRIPT_MIME_TYPE)); # HG changeset patch # User ffjre@netbeans.org # Date 1244029606 -7200 # Node ID 8def20d971505864eb030e5412be31d3f942abb0 # Parent aef395da7c560ab4316951317883f4e8e080f036 # Parent 5ae5c863ede48e408fe75b1baa65311cff6da9b2 Automated merge diff --git a/javascript.editing/src/org/netbeans/modules/javascript/editing/embedding/JsEmbeddingProvider.java b/javascript.editing/src/org/netbeans/modules/javascript/editing/embedding/JsEmbeddingProvider.java --- a/javascript.editing/src/org/netbeans/modules/javascript/editing/embedding/JsEmbeddingProvider.java +++ b/javascript.editing/src/org/netbeans/modules/javascript/editing/embedding/JsEmbeddingProvider.java @@ -583,7 +583,8 @@ //need to adjust the last embedding //1. remove the embedding from the list - assert embeddings.remove(state.lastInlinedJavscriptEmbedding); + boolean removed = embeddings.remove(state.lastInlinedJavscriptEmbedding); + assert removed; //2. create new embedding with the adjusted length embeddings.add(snapshot.create(sourceStart, sourceLength, JsTokenId.JAVASCRIPT_MIME_TYPE)); # HG changeset patch # User ffjre@netbeans.org # Date 1244021206 -14400 # Node ID 218c1d657d2b8b0d937498a8f9ccf9c46d219e6c # Parent 2d3155c1f50544b2c0741f75585d8a6a90b5ff18 # Parent 6ddbdc8a0ad4cbe414002ccf88980fc1f7f06460 Automated merge with http://hg.netbeans.org/cnd-main diff --git a/ide.kit/test/qa-functional/src/org/netbeans/test/ide/CountingSecurityManager.java b/ide.kit/test/qa-functional/src/org/netbeans/test/ide/CountingSecurityManager.java --- a/ide.kit/test/qa-functional/src/org/netbeans/test/ide/CountingSecurityManager.java +++ b/ide.kit/test/qa-functional/src/org/netbeans/test/ide/CountingSecurityManager.java @@ -57,6 +57,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import junit.framework.Assert; +import org.openide.util.Utilities; /** * @@ -460,7 +461,10 @@ } } } - + if (file.endsWith("harness/modules/org-netbeans-modules-nbjunit.jar")) { + return false; + } + // mac osx dirs = System.getProperty("java.ext.dirs"); if (dirs != null) { @@ -470,6 +474,9 @@ } } } + if (Utilities.isMac() && file.startsWith("/System/Library/Frameworks/JavaVM.framework/")) { + return false; + } return true; } diff --git a/ide.kit/test/qa-functional/src/org/netbeans/test/ide/GeneralSanityTest.java b/ide.kit/test/qa-functional/src/org/netbeans/test/ide/GeneralSanityTest.java --- a/ide.kit/test/qa-functional/src/org/netbeans/test/ide/GeneralSanityTest.java +++ b/ide.kit/test/qa-functional/src/org/netbeans/test/ide/GeneralSanityTest.java @@ -73,6 +73,8 @@ } public static Test suite() { + // disable 'slowness detection' + System.setProperty("org.netbeans.core.TimeableEventQueue.quantum", "100000"); NbTestSuite s = new NbTestSuite(); s.addTest(new GeneralSanityTest("testInitBlacklistedClassesHandler")); s.addTest(NbModuleSuite.create( diff --git a/nbbuild/build.xml b/nbbuild/build.xml --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -1510,6 +1510,11 @@ + + + + + diff --git a/o.n.bootstrap/src/org/netbeans/Stamps.java b/o.n.bootstrap/src/org/netbeans/Stamps.java --- a/o.n.bootstrap/src/org/netbeans/Stamps.java +++ b/o.n.bootstrap/src/org/netbeans/Stamps.java @@ -91,6 +91,15 @@ stamp(false); return; } + if (args.length == 1 && "init".equals(args[0])) { // NOI18N + moduleJARs = null; + stamp(true); + return; + } + if (args.length == 1 && "clear".equals(args[0])) { // NOI18N + moduleJARs = null; + return; + } } private static final Stamps MODULES_JARS = new Stamps(); /** Creates instance of stamp that checks timestamp for all files that affect @@ -359,35 +368,46 @@ File configDir = new File(new File(cluster, "config"), "Modules"); // NOI18N File modulesDir = new File(cluster, "modules"); // NOI18N - - highestStampForDir(configDir, result); - highestStampForDir(modulesDir, result); + + AtomicLong clusterResult = new AtomicLong(); + if (highestStampForDir(configDir, clusterResult) && highestStampForDir(modulesDir, clusterResult)) { + // ok + } else { + if (!cluster.isDirectory()) { + // skip non-existing clusters` + return; + } + } + + if (clusterResult.longValue() > result.longValue()) { + result.set(clusterResult.longValue()); + } if (createStampFile) { try { stamp.getParentFile().mkdirs(); stamp.createNewFile(); - stamp.setLastModified(result.longValue()); + stamp.setLastModified(clusterResult.longValue()); } catch (IOException ex) { System.err.println("Cannot write timestamp to " + stamp); // NOI18N } } } - private static void highestStampForDir(File file, AtomicLong result) { + private static boolean highestStampForDir(File file, AtomicLong result) { File[] children = file.listFiles(); if (children == null) { long time = file.lastModified(); if (time > result.longValue()) { result.set(time); } - return; + return false; } for (File f : children) { highestStampForDir(f, result); } - + return true; } private static boolean compareAndUpdateFile(File file, String content, AtomicLong result) { diff --git a/o.n.bootstrap/test/unit/src/org/netbeans/StampsExtraTest.java b/o.n.bootstrap/test/unit/src/org/netbeans/StampsExtraTest.java new file mode 100644 --- /dev/null +++ b/o.n.bootstrap/test/unit/src/org/netbeans/StampsExtraTest.java @@ -0,0 +1,137 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2008 Sun Microsystems, Inc. + */ + +package org.netbeans; + +import java.io.File; +import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; +import junit.framework.Test; +import org.netbeans.junit.NbTestCase; +import org.netbeans.junit.NbTestSuite; + +/** + * + * @author Jaroslav Tulach + */ +public class StampsExtraTest extends NbTestCase { + private File userdir; + private File ide; + private File platform; + private File install; + private File extra; + + + public static Test suite() { + //return new StampsTest("testStampsInvalidatedWhenClustersChange"); + return new NbTestSuite(StampsExtraTest.class); + } + + public StampsExtraTest(String testName) { + super(testName); + } + + public void testTimeStampsWhenAddingCluster() throws Exception { + clearWorkDir(); + + install = new File(getWorkDir(), "install"); + platform = new File(install, "platform7"); + platform.mkdirs(); + ide = new File(install, "ide8"); + ide.mkdirs(); + extra = new File(install, "extra"); + userdir = new File(getWorkDir(), "tmp"); + userdir.mkdirs(); + + System.setProperty("netbeans.home", platform.getPath()); + System.setProperty("netbeans.dirs", ide.getPath() + File.pathSeparator + extra.getPath()); + System.setProperty("netbeans.user", userdir.getPath()); + + touch(platform, ".lastModified", 50000L); + touch(ide, ".lastModified", 90000L); + assertFalse("One cluster does not exists", extra.isDirectory()); + + Stamps.main("init"); + + Thread.sleep(100); + + Logger l = Logger.getLogger("org"); + l.setLevel(Level.OFF); + l.setUseParentHandlers(false); + + long stamp = Stamps.moduleJARs(); + assertEquals("Timestamp is taken from api.languages module", 90000L, stamp); + + Stamps.main("clear"); + + CountingSecurityManager.initialize(install.getPath()); + + long newStamp = Stamps.moduleJARs(); + + CountingSecurityManager.assertCounts("Just few accesses to installation", 6); + assertEquals("Stamps are the same", stamp, newStamp); + + File lastModifiedDir = new File(new File(new File(userdir, "var"), "cache"), "lastModified"); + File extraLM = new File(lastModifiedDir, "extra"); + assertFalse("File has not been created for non-existing cluster", extraLM.canRead()); + + extra.mkdirs(); + File lastModified = new File(extra, ".lastModified"); + lastModified.createNewFile(); + lastModified.setLastModified(200000L); + assertEquals("Correct last modified", 200000L, lastModified.lastModified()); + + Stamps.main("clear"); + stamp = Stamps.moduleJARs(); + if (stamp < 200000L) { + fail("lastModified has not been updated: " + stamp); + } + } + + private static void touch(File root, String rel, long time) throws IOException { + File f = new File(root, rel.replace('/', File.separatorChar)); + if (!f.exists()) { + f.getParentFile().mkdirs(); + f.createNewFile(); + } + f.setLastModified(time); + assertEquals("Correct last modified for " + f, time, f.lastModified()); + } +} diff --git a/o.n.bootstrap/test/unit/src/org/netbeans/StampsIdeLessThanPlatformTest.java b/o.n.bootstrap/test/unit/src/org/netbeans/StampsIdeLessThanPlatformTest.java new file mode 100644 --- /dev/null +++ b/o.n.bootstrap/test/unit/src/org/netbeans/StampsIdeLessThanPlatformTest.java @@ -0,0 +1,111 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2008 Sun Microsystems, Inc. + */ + +package org.netbeans; + +import java.io.File; +import java.util.logging.Level; +import java.util.logging.Logger; +import junit.framework.Test; +import org.netbeans.junit.NbTestCase; +import org.netbeans.junit.NbTestSuite; + +/** + * + * @author Jaroslav Tulach + */ +public class StampsIdeLessThanPlatformTest extends NbTestCase { + private File userdir; + private File ide; + private File platform; + private File install; + + + public static Test suite() { + //return new StampsTest("testStampsInvalidatedWhenClustersChange"); + return new NbTestSuite(StampsIdeLessThanPlatformTest.class); + } + + public StampsIdeLessThanPlatformTest(String testName) { + super(testName); + } + + @Override + protected void setUp() throws Exception { + clearWorkDir(); + + install = new File(getWorkDir(), "install"); + platform = new File(install, "platform7"); + ide = new File(install, "ide8"); + userdir = new File(getWorkDir(), "tmp"); + + System.setProperty("netbeans.home", platform.getPath()); + System.setProperty("netbeans.dirs", ide.getPath()); + System.setProperty("netbeans.user", userdir.getPath()); + + StampsTest.createModule("org.openide.awt", platform, 50000L); + StampsTest.createModule("org.openide.nodes", platform, 60000L); + StampsTest.createModule("org.netbeans.api.languages", ide, 50000L); + StampsTest.createModule("org.netbeans.modules.logmanagement", userdir, 10000L); + + Stamps.main("reset"); + + Thread.sleep(100); + + Logger l = Logger.getLogger("org"); + l.setLevel(Level.OFF); + l.setUseParentHandlers(false); + } + + @Override + protected void tearDown() throws Exception { + super.tearDown(); + } + + public void testGenerateTimeStamps() { + long stamp = Stamps.moduleJARs(); + assertEquals("Timestamp is taken from nodes module", 60000L, stamp); + + StampsTest.assertStamp(60000L, platform, false, true); + StampsTest.assertStamp(50000L, ide, false, true); + StampsTest.assertStamp(-1L, userdir, false, false); + } + + +} diff --git a/o.n.bootstrap/test/unit/src/org/netbeans/StampsTest.java b/o.n.bootstrap/test/unit/src/org/netbeans/StampsTest.java --- a/o.n.bootstrap/test/unit/src/org/netbeans/StampsTest.java +++ b/o.n.bootstrap/test/unit/src/org/netbeans/StampsTest.java @@ -45,7 +45,6 @@ import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.MappedByteBuffer; -import java.util.LinkedList; import java.util.concurrent.Semaphore; import java.util.logging.Level; import java.util.logging.Logger; @@ -558,9 +557,9 @@ } } } - - - private static void assertStamp(long expectedValue, File cluster, boolean global, boolean local) { + + + static void assertStamp(long expectedValue, File cluster, boolean global, boolean local) { File globalStamp = new File(cluster, ".lastModified"); File userDir = new File(System.getProperty("netbeans.user")); @@ -582,7 +581,7 @@ } - private void createModule(String cnb, File cluster, long accesTime) throws IOException { + static void createModule(String cnb, File cluster, long accesTime) throws IOException { String dashes = cnb.replace('.', '-'); File config = new File(new File(new File(cluster, "config"), "Modules"), dashes + ".xml"); diff --git a/o.n.core/arch.xml b/o.n.core/arch.xml --- a/o.n.core/arch.xml +++ b/o.n.core/arch.xml @@ -514,6 +514,12 @@ The context field is accessed from editor module by reflection from MultiKeymap. + + The module expects profiler to provide SelfProfileAction + and interacts with it as described in + profiler/test/unit/src/org/netbeans/modules/profiler/actions/SelfSamplerActionTest.java + test. +

diff --git a/o.n.core/src/org/netbeans/core/Bundle.properties b/o.n.core/src/org/netbeans/core/Bundle.properties --- a/o.n.core/src/org/netbeans/core/Bundle.properties +++ b/o.n.core/src/org/netbeans/core/Bundle.properties @@ -179,3 +179,9 @@ # NbAuthenticatorPanel NbAuthenticatorPanel.userNameLbl.text=&User Name: NbAuthenticatorPanel.passwordLbl.text=&Password: + +# TimableEventQueue +TEQ_LowPerformance=System slowness detected +# {0} time in ms +# {1} time in s +TEQ_BlockedFor=Not reponsive for {0,choice,0#{0} ms|5000#{1} s}. \ No newline at end of file diff --git a/o.n.core/src/org/netbeans/core/TimableEventQueue.java b/o.n.core/src/org/netbeans/core/TimableEventQueue.java --- a/o.n.core/src/org/netbeans/core/TimableEventQueue.java +++ b/o.n.core/src/org/netbeans/core/TimableEventQueue.java @@ -42,15 +42,32 @@ import java.awt.AWTEvent; import java.awt.EventQueue; import java.awt.Toolkit; -import java.util.EmptyStackException; -import java.util.Map; -import java.util.ResourceBundle; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.LinkedList; +import java.util.Queue; import java.util.logging.Level; -import java.util.logging.LogRecord; import java.util.logging.Logger; +import javax.swing.Action; import org.netbeans.core.startup.Main; +import org.openide.awt.Notification; +import org.openide.awt.NotificationDisplayer; +import org.openide.filesystems.FileObject; +import org.openide.filesystems.FileUtil; +import org.openide.loaders.DataObject; +import org.openide.nodes.Node; +import org.openide.util.ContextAwareAction; +import org.openide.util.Exceptions; +import org.openide.util.ImageUtilities; import org.openide.util.Mutex; +import org.openide.util.NbBundle; import org.openide.util.RequestProcessor; +import org.openide.util.lookup.Lookups; +import org.openide.windows.WindowManager; /** * Logging event queue that can report problems about too long execution times @@ -62,19 +79,20 @@ implements Runnable { private static final Logger LOG = Logger.getLogger(TimableEventQueue.class.getName()); private static final RequestProcessor RP = new RequestProcessor("Timeable Event Queue Watch Dog", 1, true); // NOI18N - private static final int QUANTUM = Integer.getInteger("org.netbeans.core.TimeableEventQueue.quantum", 5000); // NOI18N - private static final int PAUSE = Integer.getInteger("org.netbeans.core.TimeableEventQueue.pause", 60000); // NOI18N + private static final int QUANTUM = Integer.getInteger("org.netbeans.core.TimeableEventQueue.quantum", 100); // NOI18N + private static final int REPORT = Integer.getInteger("org.netbeans.core.TimeableEventQueue.report", 1000); // NOI18N + private static final int PAUSE = Integer.getInteger("org.netbeans.core.TimeableEventQueue.pause", 15000); // NOI18N - private final RequestProcessor.Task TIMEOUT; - private volatile Map stack; private volatile long ignoreTill; private volatile long start; - + private volatile ActionListener stoppable; + private final Queue pending; public TimableEventQueue() { TIMEOUT = RP.create(this); TIMEOUT.setPriority(Thread.MIN_PRIORITY); + pending = new LinkedList(); } static void initialize() { @@ -97,74 +115,86 @@ e.printStackTrace(); } } + @Override protected void dispatchEvent(AWTEvent event) { try { - tick(); + tick("dispatchEvent"); // NOI18N super.dispatchEvent(event); } finally { done(); } } - @Override - public void postEvent(AWTEvent theEvent) { - try { - tick(); - super.postEvent(theEvent); - } finally { - done(); - } - } - - @Override - public synchronized void push(EventQueue newEventQueue) { - try { - tick(); - super.push(newEventQueue); - } finally { - done(); - } - } - private void done() { - stack = null; TIMEOUT.cancel(); long time = System.currentTimeMillis() - start; - if (time > 50) { - LOG.log(Level.FINE, "done, timer stopped, took {0}", time); + if (time > QUANTUM) { + LOG.log(Level.FINE, "done, timer stopped, took {0}", time); // NOI18N + if (time > REPORT) { + LOG.log(Level.WARNING, "too much time in AWT thread {0}", stoppable); // NOI18N + ActionListener ss = stoppable; + if (ss != null) { + try { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + DataOutputStream dos = new DataOutputStream(out); + ss.actionPerformed(new ActionEvent(dos, 0, "write")); // NOI18N + dos.close(); + pending.add(new NotifySnapshot(out.toByteArray(), time)); + if (pending.size() > 5) { + pending.remove().clear(); + } + stoppable = null; + } catch (Exception ex) { + Exceptions.printStackTrace(ex); + } + ignoreTill = System.currentTimeMillis() + PAUSE; + } + } } else { LOG.log(Level.FINEST, "done, timer stopped, took {0}", time); } + ActionListener ss = stoppable; + if (ss != null) { + ss.actionPerformed(new ActionEvent(this, 0, "cancel")); // NOI18N + stoppable = null; + } + return; } - private void tick() { - stack = null; + private void tick(String name) { start = System.currentTimeMillis(); - if (start >= ignoreTill) { - LOG.log(Level.FINEST, "tick, schedule a timer at {0}", start); + if (start >= ignoreTill && WindowManager.getDefault().getMainWindow().isShowing()) { + LOG.log(Level.FINEST, "tick, schedule a timer for {0}", name); TIMEOUT.schedule(QUANTUM); } } public void run() { - stack = Thread.getAllStackTraces(); - LOG.log(Level.FINER, "timer running"); - for (int i = 0; i < 10; i++) { - if (Thread.interrupted()) { - LOG.log(Level.FINER, "timer cancelled"); - return; - } - Thread.yield(); - System.gc(); - System.runFinalization(); - } - final Map myStack = stack; - if (myStack == null) { - LOG.log(Level.FINER, "timer cancelled"); + if (stoppable != null) { + LOG.log(Level.WARNING, "Still previous controller {0}", stoppable); return; } - + Runnable selfSampler = (Runnable)createSelfSampler(); + if (selfSampler != null) { + selfSampler.run(); + stoppable = (ActionListener)selfSampler; + } + } + + private static Object createSelfSampler() { + FileObject fo = FileUtil.getConfigFile("Actions/Profile/org-netbeans-modules-profiler-actions-SelfSamplerAction.instance"); + if (fo == null) { + return null; + } + Action a = (Action)fo.getAttribute("delegate"); // NOI18N + if (a == null) { + return null; + } + return a.getValue("logger-awt"); // NOI18N + } + + /* long now = System.currentTimeMillis(); ignoreTill = now + PAUSE; long howLong = now - start; @@ -179,7 +209,7 @@ // UI_LOG.log(rec); LOG.log(rec); } - + private static final class EQException extends Exception { private volatile Map stack; @@ -243,4 +273,41 @@ } } + */ + + private static final class NotifySnapshot implements ActionListener { + private final byte[] content; + private final Notification note; + + NotifySnapshot(byte[] arr, long time) { + content = arr; + note = NotificationDisplayer.getDefault().notify( + NbBundle.getMessage(NotifySnapshot.class, "TEQ_LowPerformance"), + ImageUtilities.loadImageIcon("org/netbeans/core/resources/vilik.png", true), + NbBundle.getMessage(NotifySnapshot.class, "TEQ_BlockedFor", time, time / 1000), + this, NotificationDisplayer.Priority.LOW + ); + } + + public void actionPerformed(ActionEvent e) { + try { + FileObject fo = FileUtil.createMemoryFileSystem().getRoot().createData("slow.nps"); + OutputStream os = fo.getOutputStream(); + os.write(content); + os.close(); + final Node obj = DataObject.find(fo).getNodeDelegate(); + Action a = obj.getPreferredAction(); + if (a instanceof ContextAwareAction) { + a = ((ContextAwareAction)a).createContextAwareInstance(Lookups.singleton(obj)); + } + a.actionPerformed(e); + } catch (IOException ex) { + Exceptions.printStackTrace(ex); + } + } + + public void clear() { + note.clear(); + } + } } diff --git a/o.n.core/src/org/netbeans/core/resources/vilik.png b/o.n.core/src/org/netbeans/core/resources/vilik.png new file mode 100644 index 0000000000000000000000000000000000000000..bacd931f5face49bdb50845a35c1396e88b21af8 GIT binary patch literal 876 zc$@)j1C#uTP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2iXN0 z2oM21cdWAj000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0008VNkl3nvV2lz)9wLg)KrK^gdntX;LT~B4vndhX5dY*PCnx#O`Sa&L5?>$z z^?(7W0z5#B6(BC_e*+T0x*|DKoEre4*js=SzPY-Dr+^>mD=|un4sKBt#Jakw`i_nr zCq+q2b$9RT>FXPN45&*a;af@P&;RP(zf-xAT`=y==b}@?|A>#fkNcZ?d;13iflUqD zxBb2^7>ub!^_t-;Ig%v#{q1*~n;SQpOr?az{;I8X#oN7J^Bbqr(x$4pXd;o3T(0sx z(P(N!*Y)sn53pD)Cb!%DQ+c@)S(Y&vojA%^1-f48l+|c7sh&Q4pkrwG^4~pwwELC} zVqJrMO=rM&RuF_zB^FX6k%+0Kr3K?c3{}$>pFMl8xZO5WXlh37I?{S%{QX4YW^exx zfZ+95>#tq$KW}T>T7{M-mrFA+S_O#^N+^TSEs_^ z*&zVw&vV;;?(7U4M&1sE7zRP1)|Eyqna5mvhMCy~c_I1Ypw*c1RFrA9L%XXz^V!@{ zU!x;FJQ{mxFq_LX#0n@VphW;k&EU}$h8Iv}i+^$qJCCXdV7WwV(Ao@$G4I+9TlgrSkqSkJo;@sBGmScYbx zvY5b9;5ML1-?3mGSPjTP8Ylp%?@_Syd}6UwK>r`!qzkE&Kr99T0000= 0; - } - assertTrue("Slow is in the stack trace", found); } private static final class CountingHandler extends Handler { diff --git a/openide.loaders/src/org/openide/loaders/FolderInstance.java b/openide.loaders/src/org/openide/loaders/FolderInstance.java --- a/openide.loaders/src/org/openide/loaders/FolderInstance.java +++ b/openide.loaders/src/org/openide/loaders/FolderInstance.java @@ -46,13 +46,13 @@ import java.beans.PropertyChangeEvent; import java.io.IOException; import java.util.*; +import java.util.concurrent.Callable; import java.util.logging.Level; import java.util.logging.Logger; import org.netbeans.modules.openide.loaders.AWTTask; import org.openide.filesystems.*; import org.openide.cookies.InstanceCookie; -import org.openide.util.Exceptions; import org.openide.util.Task; import org.openide.util.TaskListener; import org.openide.util.RequestProcessor; @@ -415,6 +415,7 @@ InstanceCookie cookie; //Order of checking reversed first check cookie and then folder // test if we accept the instance + // XXX for subtle reasons, current test fails if this is changed to getLookup: cookie = dob.getCookie(InstanceCookie.class); try { cookie = cookie == null ? null : acceptCookie (cookie); @@ -422,10 +423,12 @@ } catch (IOException ex) { // an error during a call to acceptCookie err.log(Level.WARNING, null, ex); + revertProblematicFile(dob); cookie = null; } catch (ClassNotFoundException ex) { // an error during a call to acceptCookie - err.log(Level.WARNING, null, ex); + err.log(Level.INFO, null, ex); + revertProblematicFile(dob); cookie = null; } @@ -459,6 +462,16 @@ return cookie; } + private void revertProblematicFile(DataObject dob) { + Object rw = dob.getPrimaryFile().getAttribute("removeWritables"); // NOI18N + if (rw instanceof Callable) { + try { + ((Callable) rw).call(); + } catch (Exception x) { + err.log(Level.INFO, null, x); + } + } + } /** Allows subclasses to decide whether they want to work with * the specified InstanceCookie or not. diff --git a/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java b/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java --- a/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java +++ b/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java @@ -39,7 +39,9 @@ package org.netbeans.performance.scalability; +import java.io.File; import java.io.FileDescriptor; +import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; import java.security.Permission; @@ -48,6 +50,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicLong; import junit.framework.Assert; +import org.openide.util.Exceptions; /** * @@ -78,6 +81,12 @@ msgs = new StringWriter(); pw = new PrintWriter(msgs); CountingSecurityManager.prefix = prefix; + try { + CountingSecurityManager.prefix = new File(prefix).getCanonicalPath(); + } catch (IOException ex) { + Exceptions.printStackTrace(ex); + } + System.err.println("setting prefix to " + CountingSecurityManager.prefix); Statistics.reset(); } diff --git a/performance/test/unit/src/org/netbeans/performance/scalability/ExpandFolderTest.java b/performance/test/unit/src/org/netbeans/performance/scalability/ExpandFolderTest.java --- a/performance/test/unit/src/org/netbeans/performance/scalability/ExpandFolderTest.java +++ b/performance/test/unit/src/org/netbeans/performance/scalability/ExpandFolderTest.java @@ -79,6 +79,7 @@ Configuration config = NbModuleSuite.createConfiguration(ExpandFolderTest.class) .clusters(clusters) .enableModules(modules) + .honorAutoloadEager(true) .gui(false); return NbModuleSuite.create(config); } diff --git a/profiler/src/org/netbeans/modules/profiler/actions/SelfSamplerAction.java b/profiler/src/org/netbeans/modules/profiler/actions/SelfSamplerAction.java --- a/profiler/src/org/netbeans/modules/profiler/actions/SelfSamplerAction.java +++ b/profiler/src/org/netbeans/modules/profiler/actions/SelfSamplerAction.java @@ -42,13 +42,18 @@ import java.awt.Toolkit; import java.awt.event.AWTEventListener; import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.awt.event.KeyEvent; +import java.io.DataOutputStream; +import java.nio.channels.WritableByteChannel; import java.util.Collections; +import java.util.concurrent.Callable; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicReference; import javax.swing.AbstractAction; import javax.swing.Action; import org.netbeans.lib.profiler.common.ProfilingSettingsPresets; @@ -56,6 +61,7 @@ import org.netbeans.lib.profiler.results.cpu.StackTraceSnapshotBuilder; import org.netbeans.modules.profiler.LoadedSnapshot; import org.netbeans.modules.profiler.ResultsManager; +import org.openide.util.Exceptions; import org.openide.util.ImageUtilities; import org.openide.util.NbBundle; @@ -74,12 +80,7 @@ private static final String ACTION_NAME_STOP = NbBundle.getMessage(SelfSamplerAction.class, "SelfSamplerAction_ActionNameStop"); // private static final String ACTION_DESCR = NbBundle.getMessage(SelfSamplerAction.class, "SelfSamplerAction_ActionDescription"); private static final String THREAD_NAME = NbBundle.getMessage(SelfSamplerAction.class, "SelfSamplerAction_ThreadName"); - private StackTraceSnapshotBuilder builder; - private ThreadFactory threadFactory; - private ScheduledExecutorService executor; - - private AtomicBoolean isRunning = new AtomicBoolean(false); - private long startTime; + private final AtomicReference RUNNING = new AtomicReference(); //~ Constructors ------------------------------------------------------------------------------------------------------------- private SelfSamplerAction() { @@ -101,24 +102,6 @@ //~ Methods ------------------------------------------------------------------------------------------------------------------ - /** - * @return the builder - */ - private synchronized StackTraceSnapshotBuilder getBuilder() { - if (builder == null) { - builder = new StackTraceSnapshotBuilder(); - threadFactory = new ThreadFactory() { - public Thread newThread(Runnable r) { - return new Thread(r, THREAD_NAME); - } - }; - builder.setIgnoredThreads(Collections.singleton(THREAD_NAME)); - } - return builder; - } - - - @Override public boolean isEnabled() { return true; @@ -128,42 +111,23 @@ * Invoked when an action occurs. */ public void actionPerformed(final ActionEvent e) { - if (isRunning.compareAndSet(false, true)) { + Controller c; + if (RUNNING.compareAndSet(null, c = new Controller(THREAD_NAME))) { putValue(Action.NAME, ACTION_NAME_STOP); putValue(Action.SMALL_ICON, ImageUtilities.loadImageIcon( "org/netbeans/modules/profiler/actions/resources/modifyProfiling.png" //NOI18N - , false) + , false) ); - final StackTraceSnapshotBuilder b = getBuilder(); - executor = Executors.newSingleThreadScheduledExecutor(threadFactory); - startTime = System.currentTimeMillis(); - executor.scheduleAtFixedRate(new Runnable() { - public void run() { - b.addStacktrace(Thread.getAllStackTraces(), System.nanoTime()); - } - }, 10, 10, TimeUnit.MILLISECONDS); - } else if (isRunning.compareAndSet(true, false)) { + c.run(); + } else if ((c = RUNNING.getAndSet(null)) != null) { putValue(Action.NAME, ACTION_NAME_START); putValue(Action.SMALL_ICON, ImageUtilities.loadImageIcon( "org/netbeans/modules/profiler/actions/resources/openSnapshot.png" //NOI18N - , false) + , false) ); - try { - executor.shutdown(); - executor.awaitTermination(100, TimeUnit.MILLISECONDS); - CPUResultsSnapshot snapshot = getBuilder().createSnapshot(startTime, System.nanoTime()); - LoadedSnapshot loadedSnapshot = new LoadedSnapshot(snapshot, ProfilingSettingsPresets.createCPUPreset(), null, null); - loadedSnapshot.setSaved(true); - ResultsManager.getDefault().openSnapshot(loadedSnapshot); - getBuilder().reset(); - - } catch (CPUResultsSnapshot.NoDataAvailableException ex) { - ex.printStackTrace(); - } catch (InterruptedException ex) { - Thread.currentThread().interrupt(); - } + c.actionPerformed(new ActionEvent(this, 0, "show")); // NOI18N } } @@ -176,5 +140,75 @@ } } + @Override + public Object getValue(String key) { + Object o = super.getValue(key); + if (o == null && key.startsWith("logger-")) { // NOI18N + return new Controller(key); + } + return o; + } + + + private static final class Controller implements Runnable, ActionListener { + private final String name; + private StackTraceSnapshotBuilder builder; + private ThreadFactory threadFactory; + private ScheduledExecutorService executor; + private long startTime; + + public Controller(String n) { + name = n; + } + /** + * @return the builder + */ + private synchronized StackTraceSnapshotBuilder getBuilder() { + if (builder == null) { + builder = new StackTraceSnapshotBuilder(); + threadFactory = new ThreadFactory() { + public Thread newThread(Runnable r) { + return new Thread(r, name); + } + }; + builder.setIgnoredThreads(Collections.singleton(name)); + } + return builder; + } + + public void run() { + final StackTraceSnapshotBuilder b = getBuilder(); + executor = Executors.newSingleThreadScheduledExecutor(threadFactory); + startTime = System.currentTimeMillis(); + executor.scheduleAtFixedRate(new Runnable() { + public void run() { + b.addStacktrace(Thread.getAllStackTraces(), System.nanoTime()); + } + }, 10, 10, TimeUnit.MILLISECONDS); + } + + public void actionPerformed(ActionEvent e) { + try { + executor.shutdown(); + executor.awaitTermination(100, TimeUnit.MILLISECONDS); + if ("cancel".equals(e.getActionCommand())) { + return; + } + CPUResultsSnapshot snapshot = getBuilder().createSnapshot(startTime, System.nanoTime()); + LoadedSnapshot loadedSnapshot = new LoadedSnapshot(snapshot, ProfilingSettingsPresets.createCPUPreset(), null, null); + if ("write".equals(e.getActionCommand())) { + DataOutputStream dos = (DataOutputStream)e.getSource(); + loadedSnapshot.save(dos); + return; + } + loadedSnapshot.setSaved(true); + ResultsManager.getDefault().openSnapshot(loadedSnapshot); + } catch (Exception ex) { + Exceptions.printStackTrace(ex); + } finally { + getBuilder().reset(); + } + } + } } diff --git a/profiler/test/unit/src/org/netbeans/modules/profiler/actions/SelfSamplerActionTest.java b/profiler/test/unit/src/org/netbeans/modules/profiler/actions/SelfSamplerActionTest.java new file mode 100644 --- /dev/null +++ b/profiler/test/unit/src/org/netbeans/modules/profiler/actions/SelfSamplerActionTest.java @@ -0,0 +1,137 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.profiler.actions; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.DataOutputStream; +import java.io.OutputStream; +import java.util.logging.Level; +import javax.swing.Action; +import org.junit.Test; +import org.netbeans.junit.Log; +import org.netbeans.modules.profiler.ui.NpsDataObject; +import org.openide.cookies.OpenCookie; +import org.openide.filesystems.FileObject; +import org.openide.filesystems.FileUtil; +import org.openide.loaders.DataObject; +import static org.junit.Assert.*; + +/** Shows how o.n.core uses the SelfSamplerAction to start and stop self profiling. + * + * @author Jaroslav Tulach + */ +public class SelfSamplerActionTest { + + public SelfSamplerActionTest() { + } + + @Test + public void testSelfProfileToStream() throws Exception { + FileObject afo = FileUtil.getConfigFile("Actions/Profile/org-netbeans-modules-profiler-actions-SelfSamplerAction.instance"); + assertNotNull("SelfSamplerAction is in the right fileobject", afo); + Action a = (Action)afo.getAttribute("delegate"); // NOI18N + Object obj = a.getValue("logger-testprofile"); + assertTrue("It is runnable", obj instanceof Runnable); + assertTrue("It is action listener", obj instanceof ActionListener); + + Runnable r = (Runnable)obj; + ActionListener al = (ActionListener)obj; + + r.run(); + Thread.sleep(1000); + assertLoggerThread("logger-testprofile shall be there", true); + + FileObject fo = FileUtil.createMemoryFileSystem().getRoot().createData("slow.nps"); + OutputStream os = fo.getOutputStream(); + DataOutputStream dos = new DataOutputStream(os); + al.actionPerformed(new ActionEvent(dos, 0, "write")); // NOI18N + dos.close(); + + if (fo.getSize() < 100) { + fail("The file shall have real content: " + fo.getSize()); + } + + DataObject dataObject = DataObject.find(fo); + assertEquals("Nps DataObject", NpsDataObject.class, dataObject.getClass()); + OpenCookie oc = dataObject.getLookup().lookup(OpenCookie.class); + assertNotNull("Open cookie exists", oc); + + CharSequence log = Log.enable("", Level.WARNING); + oc.open(); + + if (log.length() > 0) { + fail("There shall be no warnings:\n" + log); + } + + assertLoggerThread("no logger- thread shall be there", false); + } + + @Test + public void testSelfProfileCancel() throws Exception { + SelfSamplerAction result = SelfSamplerAction.getInstance(); + Object obj = result.getValue("logger-testprofile"); + assertTrue("It is runnable", obj instanceof Runnable); + assertTrue("It is action listener", obj instanceof ActionListener); + + Runnable r = (Runnable)obj; + ActionListener al = (ActionListener)obj; + + r.run(); + Thread.sleep(1000); + assertLoggerThread("logger-testprofile shall be there", true); + + al.actionPerformed(new ActionEvent(this, 0, "cancel")); // NOI18N + + assertLoggerThread("no logger- thread shall be there", false); + } + + private void assertLoggerThread(String msg, boolean exist) { + for (Thread t : Thread.getAllStackTraces().keySet()) { + if (t.getName().startsWith("logger-")) { + assertTrue(msg + "There is " + t.getName() + " thread", exist); + return; + } + } + assertFalse(msg + "There is no logger- thread", exist); + } + + +} \ No newline at end of file diff --git a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindSubclassesTest.java b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindSubclassesTest.java --- a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindSubclassesTest.java +++ b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindSubclassesTest.java @@ -56,7 +56,6 @@ import org.netbeans.junit.Log; import org.netbeans.junit.NbModuleSuite; import org.netbeans.junit.NbPerformanceTest; -import org.netbeans.modules.refactoring.api.Problem; import org.netbeans.modules.refactoring.api.RefactoringElement; import org.netbeans.modules.refactoring.api.RefactoringSession; import org.netbeans.modules.refactoring.api.WhereUsedQuery; @@ -102,7 +101,6 @@ timer = Logger.getLogger("TIMER.RefactoringPrepare"); timer.setLevel(Level.FINE); timer.addHandler(getHandler()); - ClasspathInfo cp = ClasspathInfo.create(boot, compile, source); Log.enableInstances(Logger.getLogger("TIMER"), "JavacParser", Level.FINEST); FileObject testFile = getProjectDir().getFileObject("/src/simplej2seapp/Main.java"); @@ -121,7 +119,8 @@ ClasspathInfo cpi = RetoucheUtils.getClasspathInfoFor(TreePathHandle.create(object, controller)); wuq[0].getContext().add(cpi); } - }, false); + }, false).get(); + wuq[0].putValue(WhereUsedQueryConstants.FIND_SUBCLASSES, true); RefactoringSession rs = RefactoringSession.create("Session"); wuq[0].prepare(rs); @@ -130,8 +129,8 @@ StringBuilder sb = new StringBuilder(); sb.append("Symbol: '").append(symbolName[0]).append("'"); sb.append('\n').append("Number of usages: ").append(elems.size()).append('\n'); - long prepare = getHandler().get("refactoring.prepare"); try { + long prepare = getHandler().get("refactoring.prepare"); NbPerformanceTest.PerformanceData d = new NbPerformanceTest.PerformanceData(); d.name = "refactoring.prepare"+" (" + symbolName[0] + ", usages:" + elems.size() + ")"; d.value = prepare; @@ -152,6 +151,6 @@ } public static Test suite() throws InterruptedException { - return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(FindSubclassesTest.class, "testFindSub").gui(true)); + return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(FindSubclassesTest.class, "testFindSub").gui(false)); } } \ No newline at end of file diff --git a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindUsagesPerfTest.java b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindUsagesPerfTest.java --- a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindUsagesPerfTest.java +++ b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/FindUsagesPerfTest.java @@ -90,7 +90,7 @@ // find usages of symbols collected below final List handle = new ArrayList(); - src.runUserActionTask(new Task() { + src.runWhenScanFinished(new Task() { public void run(CompilationController controller) throws Exception { controller.toPhase(JavaSource.Phase.RESOLVED); @@ -99,12 +99,12 @@ handle.add(TreePathHandle.create(element, controller)); } } - }, false); + }, false).get(); // do find usages query for (final TreePathHandle element : handle) { - src.runUserActionTask(new Task() { + src.runWhenScanFinished(new Task() { public void run(CompilationController controller) throws Exception { controller.toPhase(JavaSource.Phase.RESOLVED); @@ -140,7 +140,7 @@ System.err.println(sb); } - }, false); + }, false).get(); System.gc(); System.gc(); } src = null; diff --git a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/MoveClassPerfTest.java b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/MoveClassPerfTest.java --- a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/MoveClassPerfTest.java +++ b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/MoveClassPerfTest.java @@ -92,7 +92,7 @@ final MoveRefactoring[] moveRef = new MoveRefactoring[1]; final CharSequence REFACTORED_OBJ = "org.gjt.sp.jedit.ActionSet"; - src.runUserActionTask(new Task() { + src.runWhenScanFinished(new Task() { public void run(CompilationController controller) throws Exception { controller.toPhase(JavaSource.Phase.RESOLVED); @@ -101,7 +101,7 @@ ClasspathInfo cpi = RetoucheUtils.getClasspathInfoFor(TreePathHandle.create(klass, controller)); moveRef[0].getContext().add(cpi); } - }, false); + }, false).get(); RefactoringSession rs = RefactoringSession.create("Session"); File f = FileUtil.toFile(getProjectDir().getFileObject("/src/org/gjt/sp")); @@ -136,6 +136,6 @@ } public static Test suite() throws InterruptedException { - return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(MoveClassPerfTest.class, "testMoveActionSet").gui(true)); + return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(MoveClassPerfTest.class, "testMoveActionSet").gui(false)); } } \ No newline at end of file diff --git a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/OpenDocumentsPerfTest.java b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/OpenDocumentsPerfTest.java --- a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/OpenDocumentsPerfTest.java +++ b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/OpenDocumentsPerfTest.java @@ -55,8 +55,6 @@ import org.netbeans.junit.Log; import org.netbeans.junit.NbModuleSuite; import org.netbeans.junit.NbPerformanceTest; -import org.netbeans.modules.java.source.usages.ClassIndexManager; -import org.netbeans.modules.refactoring.api.Problem; import org.netbeans.modules.refactoring.api.RefactoringElement; import org.netbeans.modules.refactoring.api.RefactoringSession; import org.netbeans.modules.refactoring.api.WhereUsedQuery; @@ -146,6 +144,6 @@ } public static Test suite() throws InterruptedException { - return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(OpenDocumentsPerfTest.class, "testOpenDocuments").gui(true)); + return NbModuleSuite.create(NbModuleSuite.emptyConfiguration().addTest(OpenDocumentsPerfTest.class, "testOpenDocuments").gui(false)); } } \ No newline at end of file # HG changeset patch # User Alexander Simon # Date 1244019999 -14400 # Node ID 42c4001181381cc7b10198ff22316a2ea5295855 # Parent f6865b1a4c6885fb7530bfda15204c52d7ea9093 noIZ: fix discovered header's extensions diff --git a/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/bridge/ProjectBridge.java b/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/bridge/ProjectBridge.java --- a/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/bridge/ProjectBridge.java +++ b/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/bridge/ProjectBridge.java @@ -147,7 +147,11 @@ public void checkForNewExtensions(Set needAdd){ Set extensions = new HashSet(); for(String name : needAdd){ - int i = name.lastIndexOf('.'); + int i = name.replace('\\', '/').lastIndexOf('/'); + if (i >= 0){ + name = name.substring(i+1); + } + i = name.lastIndexOf('.'); if (i > 0){ String extension = name.substring(i+1); if (extension.length()>0) { # HG changeset patch # User Alexander Simon # Date 1244024637 -14400 # Node ID 2e060a226e03f895eaee67e40ab76fe0715ec596 # Parent 42c4001181381cc7b10198ff22316a2ea5295855 unut tests: extract common class diff --git a/cnd.discovery/nbproject/project.xml b/cnd.discovery/nbproject/project.xml --- a/cnd.discovery/nbproject/project.xml +++ b/cnd.discovery/nbproject/project.xml @@ -190,6 +190,7 @@ org.netbeans.modules.cnd + org.netbeans.modules.cnd.remote @@ -222,6 +223,7 @@ org.netbeans.modules.editor.mimelookup + org.netbeans.modules.masterfs diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/CMakeTestCase.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/CMakeTestCase.java new file mode 100644 --- /dev/null +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/CMakeTestCase.java @@ -0,0 +1,56 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.cnd.discovery.project; + +/** + * + * @author Alexander Simon + */ +public class CMakeTestCase extends MakeProjectBase { + + public CMakeTestCase() { + super("CMake"); + } + + public void testCmake(){ + performTestProject("http://www.cmake.org/files/v2.6/cmake-2.6.4.tar.gz", null); + } +} + diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/DiscoverySuiteTest.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/DiscoverySuiteTest.java new file mode 100644 --- /dev/null +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/DiscoverySuiteTest.java @@ -0,0 +1,66 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.cnd.discovery.project; + +import junit.framework.Test; +import junit.framework.TestSuite; +import org.netbeans.modules.cnd.test.BaseTestSuite; + +/** + * + * @author Alexander Simon + */ +public class DiscoverySuiteTest extends BaseTestSuite { + + public DiscoverySuiteTest() { + super("C/C++ Discovery Test"); // NOI18N + + addTestSuite(PkgConfigTestCase.class); + addTestSuite(LiteSqlTestCase.class); + addTestSuite(ProjectCreationTestCase.class); + addTestSuite(CMakeTestCase.class); + addTestSuite(MysqlConnectorTestCase.class); + } + + public static Test suite() { + TestSuite suite = new DiscoverySuiteTest(); + return suite; + } +} diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/LiteSqlTestCase.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/LiteSqlTestCase.java new file mode 100644 --- /dev/null +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/LiteSqlTestCase.java @@ -0,0 +1,64 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.cnd.discovery.project; + +import org.openide.util.Utilities; + + +/** + * + * @author Alexander Simon + */ +public class LiteSqlTestCase extends MakeProjectBase { + + public LiteSqlTestCase() { + super("LiteSql"); + } + + public void testLiteSql(){ + if (Utilities.isWindows()) { + // make does not work on windows + // it start XWin and all hangs + // do anybody know how to make litesql on windows? + return; + } + performTestProject("http://www.mirrorservice.org/sites/download.sourceforge.net/pub/sourceforge/l/li/litesql/litesql-0.3.3.tar.gz", null); + } +} \ No newline at end of file diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java --- a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java @@ -41,6 +41,7 @@ import java.io.File; import java.io.IOException; +import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; @@ -48,9 +49,10 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ui.OpenProjects; import org.netbeans.junit.MockServices; -import org.netbeans.junit.NbTestCase; import org.netbeans.modules.cnd.api.execution.ExecutionListener; import org.netbeans.modules.cnd.api.execution.NativeExecutor; +import org.netbeans.modules.cnd.api.model.CsmFile; +import org.netbeans.modules.cnd.api.model.CsmInclude; import org.netbeans.modules.cnd.api.model.CsmModel; import org.netbeans.modules.cnd.api.model.CsmModelAccessor; import org.netbeans.modules.cnd.api.model.CsmProject; @@ -59,6 +61,8 @@ import org.netbeans.modules.cnd.makeproject.MakeProjectType; import org.netbeans.modules.cnd.modelimpl.csm.core.ModelImpl; import org.netbeans.modules.cnd.modelimpl.repository.RepositoryUtils; +import org.netbeans.modules.cnd.test.BaseTestCase; +import org.netbeans.modules.cnd.test.CndCoreTestUtils; import org.openide.WizardDescriptor; import org.openide.util.Cancellable; import org.openide.util.Exceptions; @@ -68,24 +72,36 @@ * * @author Alexander Simon */ -public abstract class MakeProjectBase extends NbTestCase { +public abstract class MakeProjectBase extends BaseTestCase { private static final boolean OPTIMIZE_NATIVE_EXECUTIONS =true; + private static final boolean TRACE = true; public MakeProjectBase(String name) { super(name); - System.setProperty("org.netbeans.modules.cnd.makeproject.api.runprofiles", "true"); // NOI18N - System.setProperty("cnd.mode.unittest", "true"); + if (TRACE) { + System.setProperty("cnd.discovery.trace.projectimport", "true"); // NOI18N + } + //System.setProperty("org.netbeans.modules.cnd.makeproject.api.runprofiles", "true"); // NOI18N + //System.setProperty("cnd.mode.unittest", "true"); System.setProperty("cnd.make.project.creation.skip.notify.header.extension", "true"); - Logger.getLogger("org.netbeans.modules.editor.settings.storage.Utils").setLevel(Level.SEVERE); + //Logger.getLogger("org.netbeans.modules.editor.settings.storage.Utils").setLevel(Level.SEVERE); } @Override protected void setUp() throws Exception { super.setUp(); - MockServices.setServices(MakeProjectType.class); + //MockServices.setServices(MakeProjectType.class); startupModel(); } + @Override + protected List getServises() { + List list = new ArrayList(); + list.add(MakeProjectType.class); + list.addAll(super.getServises()); + return list; + } + private void startupModel() { ModelImpl model = (ModelImpl) CsmModelAccessor.getModel(); model.startup(); @@ -143,7 +159,11 @@ return path+"/configure"; } } else if ("realFlags".equals(name)) { - return "CFLAGS=\"-g3 -gdwarf-2\" CXXFLAGS=\"-g3 -gdwarf-2\""; + if (path.indexOf("cmake-")>0) { + return "CFLAGS=\"-g3 -gdwarf-2\" CXXFLAGS=\"-g3 -gdwarf-2\" CMAKE_BUILD_TYPE=Debug CMAKE_CXX_FLAGS_DEBUG=\"-g3 -gdwarf-2\" CMAKE_C_FLAGS_DEBUG=\"-g3 -gdwarf-2\""; + } else { + return "CFLAGS=\"-g3 -gdwarf-2\" CXXFLAGS=\"-g3 -gdwarf-2\""; + } } else if ("buildProject".equals(name)) { if (OPTIMIZE_NATIVE_EXECUTIONS && makeFile.exists() && findObjectFiles(path)) { // optimization on developer computer: @@ -204,33 +224,27 @@ return false; } - abstract void perform(CsmProject csmProject); + protected void perform(CsmProject csmProject) { + if (TRACE) { + System.err.println("Model content:"); + } + for (CsmFile file : csmProject.getAllFiles()) { + if (TRACE) { + System.err.println("\t"+file.getAbsolutePath()); + } + for(CsmInclude include : file.getIncludes()){ + assertTrue("Not resolved include directive "+include.getIncludeName()+" in file "+file.getAbsolutePath(), include.getIncludeFile() != null); + } + } + } private String download(String urlName, List additionalScripts) throws IOException { String zipName = urlName.substring(urlName.lastIndexOf('/')+1); String tarName = zipName.substring(0, zipName.lastIndexOf('.')); String packageName = tarName.substring(0, tarName.lastIndexOf('.')); + File fileDataPath = CndCoreTestUtils.getDownloadBase(); + String dataPath = fileDataPath.getAbsolutePath(); - String dataPath; - if (false) { - // local downloads - dataPath = getDataDir().getAbsolutePath(); - if (dataPath.endsWith("/data") || dataPath.endsWith("\\data")) { - dataPath = dataPath.substring(0, dataPath.length()-4)+"downloads"; - } - } else { - // downloads in tmp dir - dataPath = System.getProperty("java.io.tmpdir"); - if (dataPath.endsWith(File.separator)) { - dataPath += System.getProperty("user.name") + "-cnd-test-downloads"; - } else { - dataPath += File.separator + System.getProperty("user.name") + "-cnd-test-downloads"; - } - } - File fileDataPath = new File(dataPath); - if (!fileDataPath.exists()) { - fileDataPath.mkdirs(); - } String createdFolder = dataPath+"/"+packageName; final AtomicBoolean finish = new AtomicBoolean(false); ExecutionListener listener = new ExecutionListener() { diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTest.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTestCase.java rename from cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTest.java rename to cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTestCase.java --- a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTest.java +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTestCase.java @@ -41,47 +41,20 @@ import java.util.ArrayList; import java.util.List; -import org.netbeans.modules.cnd.api.model.CsmFile; -import org.netbeans.modules.cnd.api.model.CsmInclude; -import org.netbeans.modules.cnd.api.model.CsmProject; /** * * @author Alexander Simon */ -public class MysqlConnectorTest extends MakeProjectBase { - private static final boolean TRACE = true; +public class MysqlConnectorTestCase extends MakeProjectBase { - public MysqlConnectorTest() { - super("MysqlConnectorTest"); - if (TRACE) { - System.setProperty("cnd.discovery.trace.projectimport", "true"); // NOI18N - } - - } - - public void testCmake(){ - performTestProject("http://www.cmake.org/files/v2.6/cmake-2.6.4.tar.gz", null); + public MysqlConnectorTestCase() { + super("MysqlConnector"); } public void testMysqlConnector(){ List list = new ArrayList(); - list.add("../cmake-2.6.4/bin/cmake -G \"Unix Makefiles\" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS=\"-g3 -gdwarf-2\" -DCMAKE_C_FLAGS=\"-g3 -gdwarf-2\""); + list.add("../cmake-2.6.4/bin/cmake -G \"Unix Makefiles\" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS_DEBUG=\"-g3 -gdwarf-2\" -DCMAKE_C_FLAGS_DEBUG=\"-g3 -gdwarf-2\""); performTestProject("http://download.softagency.net/MySQL/Downloads/Connector-C/mysql-connector-c-6.0.1.tar.gz", list); } - - @Override - void perform(CsmProject csmProject) { - if (TRACE) { - System.err.println("Model content:"); - } - for (CsmFile file : csmProject.getAllFiles()) { - if (TRACE) { - System.err.println("\t"+file.getAbsolutePath()); - } - for(CsmInclude include : file.getIncludes()){ - assertTrue("Not resolved include directive "+include.getIncludeName()+" in file "+file.getAbsolutePath(), include.getIncludeFile() != null); - } - } - } } diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/PkgConfigTestCase.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/PkgConfigTestCase.java new file mode 100644 --- /dev/null +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/PkgConfigTestCase.java @@ -0,0 +1,55 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.cnd.discovery.project; + +/** + * + * @author Alexander Simon + */ +public class PkgConfigTestCase extends MakeProjectBase { + + public PkgConfigTestCase() { + super("PkgConfig"); + } + + public void testPkgConfig(){ + performTestProject("http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz", null); + } +} \ No newline at end of file diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTest.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTestCase.java rename from cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTest.java rename to cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTestCase.java --- a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTest.java +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTestCase.java @@ -39,56 +39,17 @@ package org.netbeans.modules.cnd.discovery.project; -import org.netbeans.modules.cnd.api.model.CsmFile; -import org.netbeans.modules.cnd.api.model.CsmInclude; -import org.netbeans.modules.cnd.api.model.CsmProject; -import org.openide.util.Utilities; - /** * * @author Alexander Simon */ -public class ProjectCreationTest extends MakeProjectBase { - private static final boolean TRACE = true; +public class ProjectCreationTestCase extends MakeProjectBase { - public ProjectCreationTest() { - super("ProjectCreationTest"); - if (TRACE) { - System.setProperty("cnd.discovery.trace.projectimport", "true"); // NOI18N - } - - } - - public void testPkgConfig(){ - performTestProject("http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz", null); - } - - public void testLiteSql(){ - if (Utilities.isWindows()) { - // make does not work on windows - // it start XWin and all hangs - // do anybody know how to make litesql on windows? - return; - } - performTestProject("http://www.mirrorservice.org/sites/download.sourceforge.net/pub/sourceforge/l/li/litesql/litesql-0.3.3.tar.gz", null); + public ProjectCreationTestCase() { + super("Tesseract"); } public void testTesseract(){ performTestProject("http://tesseract-ocr.googlecode.com/files/tesseract-2.03.tar.gz", null); } - - @Override - void perform(CsmProject csmProject) { - if (TRACE) { - System.err.println("Model content:"); - } - for (CsmFile file : csmProject.getAllFiles()) { - if (TRACE) { - System.err.println("\t"+file.getAbsolutePath()); - } - for(CsmInclude include : file.getIncludes()){ - assertTrue("Not resolved include directive "+include.getIncludeName()+" in file "+file.getAbsolutePath(), include.getIncludeFile() != null); - } - } - } } diff --git a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java --- a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java +++ b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java @@ -47,7 +47,7 @@ import org.netbeans.modules.cnd.modelimpl.csm.core.ProjectBase; import org.netbeans.modules.cnd.modelimpl.csm.core.Tracer; import org.netbeans.modules.cnd.modelimpl.trace.TraceModelTestBase; -import org.openide.filesystems.FileUtil; +import org.netbeans.modules.cnd.test.CndCoreTestUtils; import org.openide.util.Exceptions; /** @@ -163,22 +163,8 @@ // tar xf pkgconfig-0.18.tar private List download() throws IOException{ List list = new ArrayList(); - String dataPath; - if (false) { - // local downloads - dataPath = getDataDir().getAbsolutePath(); - if (dataPath.endsWith("/data") || dataPath.endsWith("\\data")) { - dataPath = dataPath.substring(0, dataPath.length()-4)+"downloads"; - } - } else { - // downloads in tmp dir - dataPath = System.getProperty("java.io.tmpdir"); - if (dataPath.endsWith(File.separator)) { - dataPath += System.getProperty("user.name") + "-cnd-test-downloads"; - } else { - dataPath += File.separator + System.getProperty("user.name") + "-cnd-test-downloads"; - } - } + File fileDataPath = CndCoreTestUtils.getDownloadBase(); + String dataPath = fileDataPath.getAbsolutePath(); final AtomicBoolean finish = new AtomicBoolean(false); ExecutionListener listener = new ExecutionListener() { public void executionStarted() { diff --git a/cnd/test/unit/src/org/netbeans/modules/cnd/test/BaseTestCase.java b/cnd/test/unit/src/org/netbeans/modules/cnd/test/BaseTestCase.java --- a/cnd/test/unit/src/org/netbeans/modules/cnd/test/BaseTestCase.java +++ b/cnd/test/unit/src/org/netbeans/modules/cnd/test/BaseTestCase.java @@ -46,6 +46,9 @@ import java.io.FileWriter; import java.io.IOException; import java.io.Writer; +import java.util.ArrayList; +import java.util.List; +import java.util.Collections; import java.util.TreeSet; import java.util.logging.Level; import java.util.logging.Logger; @@ -168,7 +171,12 @@ Logger.getLogger("org.netbeans.modules.editor.settings.storage.Utils").setLevel(Level.SEVERE); System.setProperty("cnd.mode.unittest", "true"); - MockServices.setServices(MockMimeLookup.class); + List list = new ArrayList(); + list.add(MockMimeLookup.class); + for(Class cls : getServises()){ + list.add(cls); + } + MockServices.setServices(list.toArray(new Class[list.size()])); MimePath mimePath = MimePath.parse(MIMENames.CPLUSPLUS_MIME_TYPE); MockMimeLookup.setInstances(mimePath, new CCKit()); mimePath = MimePath.parse(MIMENames.HEADER_MIME_TYPE); @@ -179,6 +187,10 @@ MockMimeLookup.setInstances(mimePath, new FKit()); } + protected List getServises(){ + return Collections.emptyList(); + } + /** * Get the test method specific data file; * usually it is ${xtest.data}/${classname}/filename diff --git a/cnd/test/unit/src/org/netbeans/modules/cnd/test/CndCoreTestUtils.java b/cnd/test/unit/src/org/netbeans/modules/cnd/test/CndCoreTestUtils.java --- a/cnd/test/unit/src/org/netbeans/modules/cnd/test/CndCoreTestUtils.java +++ b/cnd/test/unit/src/org/netbeans/modules/cnd/test/CndCoreTestUtils.java @@ -54,6 +54,7 @@ import org.netbeans.editor.Utilities; import org.netbeans.junit.Manager; import org.openide.cookies.EditorCookie; +import org.openide.filesystems.FileUtil; import org.openide.loaders.DataObject; import org.openide.util.UserQuestionException; @@ -200,4 +201,24 @@ public static int getDocumentOffset(BaseDocument doc, int lineIndex, int colIndex) { return Utilities.getRowStartFromLineOffset(doc, lineIndex -1) + (colIndex - 1); } + + /** + * get common place for long living test base + * @return + */ + public static File getDownloadBase(){ + // downloads in tmp dir + String dataPath = System.getProperty("java.io.tmpdir"); + if (dataPath.endsWith(File.separator)) { + dataPath += System.getProperty("user.name") + "-cnd-test-downloads"; + } else { + dataPath += File.separator + System.getProperty("user.name") + "-cnd-test-downloads"; + } + File fileDataPath = new File(dataPath); + if (!fileDataPath.exists()) { + fileDataPath.mkdirs(); + } + return FileUtil.normalizeFile(fileDataPath); + } + } # HG changeset patch # User Alexander Simon # Date 1244024835 -14400 # Node ID 8f82eef2c1e40b725df186861bd8b19b8dd46cc1 # Parent 218c1d657d2b8b0d937498a8f9ccf9c46d219e6c # Parent 2e060a226e03f895eaee67e40ab76fe0715ec596 Automated merge with http://hg.netbeans.org/cnd-main diff --git a/cnd.discovery/nbproject/project.xml b/cnd.discovery/nbproject/project.xml --- a/cnd.discovery/nbproject/project.xml +++ b/cnd.discovery/nbproject/project.xml @@ -190,6 +190,7 @@ org.netbeans.modules.cnd + org.netbeans.modules.cnd.remote @@ -222,6 +223,7 @@ org.netbeans.modules.editor.mimelookup + org.netbeans.modules.masterfs diff --git a/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/bridge/ProjectBridge.java b/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/bridge/ProjectBridge.java --- a/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/bridge/ProjectBridge.java +++ b/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/bridge/ProjectBridge.java @@ -147,7 +147,11 @@ public void checkForNewExtensions(Set needAdd){ Set extensions = new HashSet(); for(String name : needAdd){ - int i = name.lastIndexOf('.'); + int i = name.replace('\\', '/').lastIndexOf('/'); + if (i >= 0){ + name = name.substring(i+1); + } + i = name.lastIndexOf('.'); if (i > 0){ String extension = name.substring(i+1); if (extension.length()>0) { diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/CMakeTestCase.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/CMakeTestCase.java new file mode 100644 --- /dev/null +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/CMakeTestCase.java @@ -0,0 +1,56 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.cnd.discovery.project; + +/** + * + * @author Alexander Simon + */ +public class CMakeTestCase extends MakeProjectBase { + + public CMakeTestCase() { + super("CMake"); + } + + public void testCmake(){ + performTestProject("http://www.cmake.org/files/v2.6/cmake-2.6.4.tar.gz", null); + } +} + diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/DiscoverySuiteTest.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/DiscoverySuiteTest.java new file mode 100644 --- /dev/null +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/DiscoverySuiteTest.java @@ -0,0 +1,66 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.cnd.discovery.project; + +import junit.framework.Test; +import junit.framework.TestSuite; +import org.netbeans.modules.cnd.test.BaseTestSuite; + +/** + * + * @author Alexander Simon + */ +public class DiscoverySuiteTest extends BaseTestSuite { + + public DiscoverySuiteTest() { + super("C/C++ Discovery Test"); // NOI18N + + addTestSuite(PkgConfigTestCase.class); + addTestSuite(LiteSqlTestCase.class); + addTestSuite(ProjectCreationTestCase.class); + addTestSuite(CMakeTestCase.class); + addTestSuite(MysqlConnectorTestCase.class); + } + + public static Test suite() { + TestSuite suite = new DiscoverySuiteTest(); + return suite; + } +} diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/LiteSqlTestCase.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/LiteSqlTestCase.java new file mode 100644 --- /dev/null +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/LiteSqlTestCase.java @@ -0,0 +1,64 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.cnd.discovery.project; + +import org.openide.util.Utilities; + + +/** + * + * @author Alexander Simon + */ +public class LiteSqlTestCase extends MakeProjectBase { + + public LiteSqlTestCase() { + super("LiteSql"); + } + + public void testLiteSql(){ + if (Utilities.isWindows()) { + // make does not work on windows + // it start XWin and all hangs + // do anybody know how to make litesql on windows? + return; + } + performTestProject("http://www.mirrorservice.org/sites/download.sourceforge.net/pub/sourceforge/l/li/litesql/litesql-0.3.3.tar.gz", null); + } +} \ No newline at end of file diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java --- a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java @@ -41,6 +41,7 @@ import java.io.File; import java.io.IOException; +import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; @@ -48,9 +49,10 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ui.OpenProjects; import org.netbeans.junit.MockServices; -import org.netbeans.junit.NbTestCase; import org.netbeans.modules.cnd.api.execution.ExecutionListener; import org.netbeans.modules.cnd.api.execution.NativeExecutor; +import org.netbeans.modules.cnd.api.model.CsmFile; +import org.netbeans.modules.cnd.api.model.CsmInclude; import org.netbeans.modules.cnd.api.model.CsmModel; import org.netbeans.modules.cnd.api.model.CsmModelAccessor; import org.netbeans.modules.cnd.api.model.CsmProject; @@ -59,6 +61,8 @@ import org.netbeans.modules.cnd.makeproject.MakeProjectType; import org.netbeans.modules.cnd.modelimpl.csm.core.ModelImpl; import org.netbeans.modules.cnd.modelimpl.repository.RepositoryUtils; +import org.netbeans.modules.cnd.test.BaseTestCase; +import org.netbeans.modules.cnd.test.CndCoreTestUtils; import org.openide.WizardDescriptor; import org.openide.util.Cancellable; import org.openide.util.Exceptions; @@ -68,24 +72,36 @@ * * @author Alexander Simon */ -public abstract class MakeProjectBase extends NbTestCase { +public abstract class MakeProjectBase extends BaseTestCase { private static final boolean OPTIMIZE_NATIVE_EXECUTIONS =true; + private static final boolean TRACE = true; public MakeProjectBase(String name) { super(name); - System.setProperty("org.netbeans.modules.cnd.makeproject.api.runprofiles", "true"); // NOI18N - System.setProperty("cnd.mode.unittest", "true"); + if (TRACE) { + System.setProperty("cnd.discovery.trace.projectimport", "true"); // NOI18N + } + //System.setProperty("org.netbeans.modules.cnd.makeproject.api.runprofiles", "true"); // NOI18N + //System.setProperty("cnd.mode.unittest", "true"); System.setProperty("cnd.make.project.creation.skip.notify.header.extension", "true"); - Logger.getLogger("org.netbeans.modules.editor.settings.storage.Utils").setLevel(Level.SEVERE); + //Logger.getLogger("org.netbeans.modules.editor.settings.storage.Utils").setLevel(Level.SEVERE); } @Override protected void setUp() throws Exception { super.setUp(); - MockServices.setServices(MakeProjectType.class); + //MockServices.setServices(MakeProjectType.class); startupModel(); } + @Override + protected List getServises() { + List list = new ArrayList(); + list.add(MakeProjectType.class); + list.addAll(super.getServises()); + return list; + } + private void startupModel() { ModelImpl model = (ModelImpl) CsmModelAccessor.getModel(); model.startup(); @@ -143,7 +159,11 @@ return path+"/configure"; } } else if ("realFlags".equals(name)) { - return "CFLAGS=\"-g3 -gdwarf-2\" CXXFLAGS=\"-g3 -gdwarf-2\""; + if (path.indexOf("cmake-")>0) { + return "CFLAGS=\"-g3 -gdwarf-2\" CXXFLAGS=\"-g3 -gdwarf-2\" CMAKE_BUILD_TYPE=Debug CMAKE_CXX_FLAGS_DEBUG=\"-g3 -gdwarf-2\" CMAKE_C_FLAGS_DEBUG=\"-g3 -gdwarf-2\""; + } else { + return "CFLAGS=\"-g3 -gdwarf-2\" CXXFLAGS=\"-g3 -gdwarf-2\""; + } } else if ("buildProject".equals(name)) { if (OPTIMIZE_NATIVE_EXECUTIONS && makeFile.exists() && findObjectFiles(path)) { // optimization on developer computer: @@ -204,33 +224,27 @@ return false; } - abstract void perform(CsmProject csmProject); + protected void perform(CsmProject csmProject) { + if (TRACE) { + System.err.println("Model content:"); + } + for (CsmFile file : csmProject.getAllFiles()) { + if (TRACE) { + System.err.println("\t"+file.getAbsolutePath()); + } + for(CsmInclude include : file.getIncludes()){ + assertTrue("Not resolved include directive "+include.getIncludeName()+" in file "+file.getAbsolutePath(), include.getIncludeFile() != null); + } + } + } private String download(String urlName, List additionalScripts) throws IOException { String zipName = urlName.substring(urlName.lastIndexOf('/')+1); String tarName = zipName.substring(0, zipName.lastIndexOf('.')); String packageName = tarName.substring(0, tarName.lastIndexOf('.')); + File fileDataPath = CndCoreTestUtils.getDownloadBase(); + String dataPath = fileDataPath.getAbsolutePath(); - String dataPath; - if (false) { - // local downloads - dataPath = getDataDir().getAbsolutePath(); - if (dataPath.endsWith("/data") || dataPath.endsWith("\\data")) { - dataPath = dataPath.substring(0, dataPath.length()-4)+"downloads"; - } - } else { - // downloads in tmp dir - dataPath = System.getProperty("java.io.tmpdir"); - if (dataPath.endsWith(File.separator)) { - dataPath += System.getProperty("user.name") + "-cnd-test-downloads"; - } else { - dataPath += File.separator + System.getProperty("user.name") + "-cnd-test-downloads"; - } - } - File fileDataPath = new File(dataPath); - if (!fileDataPath.exists()) { - fileDataPath.mkdirs(); - } String createdFolder = dataPath+"/"+packageName; final AtomicBoolean finish = new AtomicBoolean(false); ExecutionListener listener = new ExecutionListener() { diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTest.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTestCase.java rename from cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTest.java rename to cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTestCase.java --- a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTest.java +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTestCase.java @@ -41,47 +41,20 @@ import java.util.ArrayList; import java.util.List; -import org.netbeans.modules.cnd.api.model.CsmFile; -import org.netbeans.modules.cnd.api.model.CsmInclude; -import org.netbeans.modules.cnd.api.model.CsmProject; /** * * @author Alexander Simon */ -public class MysqlConnectorTest extends MakeProjectBase { - private static final boolean TRACE = true; +public class MysqlConnectorTestCase extends MakeProjectBase { - public MysqlConnectorTest() { - super("MysqlConnectorTest"); - if (TRACE) { - System.setProperty("cnd.discovery.trace.projectimport", "true"); // NOI18N - } - - } - - public void testCmake(){ - performTestProject("http://www.cmake.org/files/v2.6/cmake-2.6.4.tar.gz", null); + public MysqlConnectorTestCase() { + super("MysqlConnector"); } public void testMysqlConnector(){ List list = new ArrayList(); - list.add("../cmake-2.6.4/bin/cmake -G \"Unix Makefiles\" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS=\"-g3 -gdwarf-2\" -DCMAKE_C_FLAGS=\"-g3 -gdwarf-2\""); + list.add("../cmake-2.6.4/bin/cmake -G \"Unix Makefiles\" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS_DEBUG=\"-g3 -gdwarf-2\" -DCMAKE_C_FLAGS_DEBUG=\"-g3 -gdwarf-2\""); performTestProject("http://download.softagency.net/MySQL/Downloads/Connector-C/mysql-connector-c-6.0.1.tar.gz", list); } - - @Override - void perform(CsmProject csmProject) { - if (TRACE) { - System.err.println("Model content:"); - } - for (CsmFile file : csmProject.getAllFiles()) { - if (TRACE) { - System.err.println("\t"+file.getAbsolutePath()); - } - for(CsmInclude include : file.getIncludes()){ - assertTrue("Not resolved include directive "+include.getIncludeName()+" in file "+file.getAbsolutePath(), include.getIncludeFile() != null); - } - } - } } diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/PkgConfigTestCase.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/PkgConfigTestCase.java new file mode 100644 --- /dev/null +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/PkgConfigTestCase.java @@ -0,0 +1,55 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.cnd.discovery.project; + +/** + * + * @author Alexander Simon + */ +public class PkgConfigTestCase extends MakeProjectBase { + + public PkgConfigTestCase() { + super("PkgConfig"); + } + + public void testPkgConfig(){ + performTestProject("http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz", null); + } +} \ No newline at end of file diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTest.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTestCase.java rename from cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTest.java rename to cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTestCase.java --- a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTest.java +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTestCase.java @@ -39,56 +39,17 @@ package org.netbeans.modules.cnd.discovery.project; -import org.netbeans.modules.cnd.api.model.CsmFile; -import org.netbeans.modules.cnd.api.model.CsmInclude; -import org.netbeans.modules.cnd.api.model.CsmProject; -import org.openide.util.Utilities; - /** * * @author Alexander Simon */ -public class ProjectCreationTest extends MakeProjectBase { - private static final boolean TRACE = true; +public class ProjectCreationTestCase extends MakeProjectBase { - public ProjectCreationTest() { - super("ProjectCreationTest"); - if (TRACE) { - System.setProperty("cnd.discovery.trace.projectimport", "true"); // NOI18N - } - - } - - public void testPkgConfig(){ - performTestProject("http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz", null); - } - - public void testLiteSql(){ - if (Utilities.isWindows()) { - // make does not work on windows - // it start XWin and all hangs - // do anybody know how to make litesql on windows? - return; - } - performTestProject("http://www.mirrorservice.org/sites/download.sourceforge.net/pub/sourceforge/l/li/litesql/litesql-0.3.3.tar.gz", null); + public ProjectCreationTestCase() { + super("Tesseract"); } public void testTesseract(){ performTestProject("http://tesseract-ocr.googlecode.com/files/tesseract-2.03.tar.gz", null); } - - @Override - void perform(CsmProject csmProject) { - if (TRACE) { - System.err.println("Model content:"); - } - for (CsmFile file : csmProject.getAllFiles()) { - if (TRACE) { - System.err.println("\t"+file.getAbsolutePath()); - } - for(CsmInclude include : file.getIncludes()){ - assertTrue("Not resolved include directive "+include.getIncludeName()+" in file "+file.getAbsolutePath(), include.getIncludeFile() != null); - } - } - } } diff --git a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java --- a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java +++ b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java @@ -47,7 +47,7 @@ import org.netbeans.modules.cnd.modelimpl.csm.core.ProjectBase; import org.netbeans.modules.cnd.modelimpl.csm.core.Tracer; import org.netbeans.modules.cnd.modelimpl.trace.TraceModelTestBase; -import org.openide.filesystems.FileUtil; +import org.netbeans.modules.cnd.test.CndCoreTestUtils; import org.openide.util.Exceptions; /** @@ -163,22 +163,8 @@ // tar xf pkgconfig-0.18.tar private List download() throws IOException{ List list = new ArrayList(); - String dataPath; - if (false) { - // local downloads - dataPath = getDataDir().getAbsolutePath(); - if (dataPath.endsWith("/data") || dataPath.endsWith("\\data")) { - dataPath = dataPath.substring(0, dataPath.length()-4)+"downloads"; - } - } else { - // downloads in tmp dir - dataPath = System.getProperty("java.io.tmpdir"); - if (dataPath.endsWith(File.separator)) { - dataPath += System.getProperty("user.name") + "-cnd-test-downloads"; - } else { - dataPath += File.separator + System.getProperty("user.name") + "-cnd-test-downloads"; - } - } + File fileDataPath = CndCoreTestUtils.getDownloadBase(); + String dataPath = fileDataPath.getAbsolutePath(); final AtomicBoolean finish = new AtomicBoolean(false); ExecutionListener listener = new ExecutionListener() { public void executionStarted() { diff --git a/cnd/test/unit/src/org/netbeans/modules/cnd/test/BaseTestCase.java b/cnd/test/unit/src/org/netbeans/modules/cnd/test/BaseTestCase.java --- a/cnd/test/unit/src/org/netbeans/modules/cnd/test/BaseTestCase.java +++ b/cnd/test/unit/src/org/netbeans/modules/cnd/test/BaseTestCase.java @@ -46,6 +46,9 @@ import java.io.FileWriter; import java.io.IOException; import java.io.Writer; +import java.util.ArrayList; +import java.util.List; +import java.util.Collections; import java.util.TreeSet; import java.util.logging.Level; import java.util.logging.Logger; @@ -168,7 +171,12 @@ Logger.getLogger("org.netbeans.modules.editor.settings.storage.Utils").setLevel(Level.SEVERE); System.setProperty("cnd.mode.unittest", "true"); - MockServices.setServices(MockMimeLookup.class); + List list = new ArrayList(); + list.add(MockMimeLookup.class); + for(Class cls : getServises()){ + list.add(cls); + } + MockServices.setServices(list.toArray(new Class[list.size()])); MimePath mimePath = MimePath.parse(MIMENames.CPLUSPLUS_MIME_TYPE); MockMimeLookup.setInstances(mimePath, new CCKit()); mimePath = MimePath.parse(MIMENames.HEADER_MIME_TYPE); @@ -179,6 +187,10 @@ MockMimeLookup.setInstances(mimePath, new FKit()); } + protected List getServises(){ + return Collections.emptyList(); + } + /** * Get the test method specific data file; * usually it is ${xtest.data}/${classname}/filename diff --git a/cnd/test/unit/src/org/netbeans/modules/cnd/test/CndCoreTestUtils.java b/cnd/test/unit/src/org/netbeans/modules/cnd/test/CndCoreTestUtils.java --- a/cnd/test/unit/src/org/netbeans/modules/cnd/test/CndCoreTestUtils.java +++ b/cnd/test/unit/src/org/netbeans/modules/cnd/test/CndCoreTestUtils.java @@ -54,6 +54,7 @@ import org.netbeans.editor.Utilities; import org.netbeans.junit.Manager; import org.openide.cookies.EditorCookie; +import org.openide.filesystems.FileUtil; import org.openide.loaders.DataObject; import org.openide.util.UserQuestionException; @@ -200,4 +201,24 @@ public static int getDocumentOffset(BaseDocument doc, int lineIndex, int colIndex) { return Utilities.getRowStartFromLineOffset(doc, lineIndex -1) + (colIndex - 1); } + + /** + * get common place for long living test base + * @return + */ + public static File getDownloadBase(){ + // downloads in tmp dir + String dataPath = System.getProperty("java.io.tmpdir"); + if (dataPath.endsWith(File.separator)) { + dataPath += System.getProperty("user.name") + "-cnd-test-downloads"; + } else { + dataPath += File.separator + System.getProperty("user.name") + "-cnd-test-downloads"; + } + File fileDataPath = new File(dataPath); + if (!fileDataPath.exists()) { + fileDataPath.mkdirs(); + } + return FileUtil.normalizeFile(fileDataPath); + } + } # HG changeset patch # User Alexander Simon # Date 1244027020 -14400 # Node ID a93696227450df538b61a7d4b42dc97f120b9a7a # Parent 8f82eef2c1e40b725df186861bd8b19b8dd46cc1 remove compiler warnings diff --git a/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/PkgConfigImpl.java b/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/PkgConfigImpl.java --- a/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/PkgConfigImpl.java +++ b/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/PkgConfigImpl.java @@ -174,7 +174,7 @@ return new ResolvedPathImpl(pairs.get(0).path, pairs.get(0).configurations); } else { String path = pairs.get(0).path; - Set set = new LinkedHashSet(); + Set set = new LinkedHashSet(); for(Pair p : pairs){ set.addAll(p.configurations); } @@ -339,7 +339,7 @@ } List list = res.get(key); if (list == null){ - list = new ArrayList(1); + list = new ArrayList(1); res.put(key, list); } if (!list.contains(pkg)){ # HG changeset patch # User ffjre@netbeans.org # Date 1244032175 -7200 # Node ID 13a6ef7f7847c32790e637ddc47c1e5bc30d2d2d # Parent 8def20d971505864eb030e5412be31d3f942abb0 # Parent a93696227450df538b61a7d4b42dc97f120b9a7a Automated merge diff --git a/cnd.discovery/nbproject/project.xml b/cnd.discovery/nbproject/project.xml --- a/cnd.discovery/nbproject/project.xml +++ b/cnd.discovery/nbproject/project.xml @@ -190,6 +190,7 @@ org.netbeans.modules.cnd + org.netbeans.modules.cnd.remote @@ -222,6 +223,7 @@ org.netbeans.modules.editor.mimelookup + org.netbeans.modules.masterfs diff --git a/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/bridge/ProjectBridge.java b/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/bridge/ProjectBridge.java --- a/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/bridge/ProjectBridge.java +++ b/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/bridge/ProjectBridge.java @@ -147,7 +147,11 @@ public void checkForNewExtensions(Set needAdd){ Set extensions = new HashSet(); for(String name : needAdd){ - int i = name.lastIndexOf('.'); + int i = name.replace('\\', '/').lastIndexOf('/'); + if (i >= 0){ + name = name.substring(i+1); + } + i = name.lastIndexOf('.'); if (i > 0){ String extension = name.substring(i+1); if (extension.length()>0) { diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/CMakeTestCase.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/CMakeTestCase.java new file mode 100644 --- /dev/null +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/CMakeTestCase.java @@ -0,0 +1,56 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.cnd.discovery.project; + +/** + * + * @author Alexander Simon + */ +public class CMakeTestCase extends MakeProjectBase { + + public CMakeTestCase() { + super("CMake"); + } + + public void testCmake(){ + performTestProject("http://www.cmake.org/files/v2.6/cmake-2.6.4.tar.gz", null); + } +} + diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/DiscoverySuiteTest.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/DiscoverySuiteTest.java new file mode 100644 --- /dev/null +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/DiscoverySuiteTest.java @@ -0,0 +1,66 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.cnd.discovery.project; + +import junit.framework.Test; +import junit.framework.TestSuite; +import org.netbeans.modules.cnd.test.BaseTestSuite; + +/** + * + * @author Alexander Simon + */ +public class DiscoverySuiteTest extends BaseTestSuite { + + public DiscoverySuiteTest() { + super("C/C++ Discovery Test"); // NOI18N + + addTestSuite(PkgConfigTestCase.class); + addTestSuite(LiteSqlTestCase.class); + addTestSuite(ProjectCreationTestCase.class); + addTestSuite(CMakeTestCase.class); + addTestSuite(MysqlConnectorTestCase.class); + } + + public static Test suite() { + TestSuite suite = new DiscoverySuiteTest(); + return suite; + } +} diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/LiteSqlTestCase.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/LiteSqlTestCase.java new file mode 100644 --- /dev/null +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/LiteSqlTestCase.java @@ -0,0 +1,64 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.cnd.discovery.project; + +import org.openide.util.Utilities; + + +/** + * + * @author Alexander Simon + */ +public class LiteSqlTestCase extends MakeProjectBase { + + public LiteSqlTestCase() { + super("LiteSql"); + } + + public void testLiteSql(){ + if (Utilities.isWindows()) { + // make does not work on windows + // it start XWin and all hangs + // do anybody know how to make litesql on windows? + return; + } + performTestProject("http://www.mirrorservice.org/sites/download.sourceforge.net/pub/sourceforge/l/li/litesql/litesql-0.3.3.tar.gz", null); + } +} \ No newline at end of file diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java --- a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java @@ -41,6 +41,7 @@ import java.io.File; import java.io.IOException; +import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; @@ -48,9 +49,10 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ui.OpenProjects; import org.netbeans.junit.MockServices; -import org.netbeans.junit.NbTestCase; import org.netbeans.modules.cnd.api.execution.ExecutionListener; import org.netbeans.modules.cnd.api.execution.NativeExecutor; +import org.netbeans.modules.cnd.api.model.CsmFile; +import org.netbeans.modules.cnd.api.model.CsmInclude; import org.netbeans.modules.cnd.api.model.CsmModel; import org.netbeans.modules.cnd.api.model.CsmModelAccessor; import org.netbeans.modules.cnd.api.model.CsmProject; @@ -59,6 +61,8 @@ import org.netbeans.modules.cnd.makeproject.MakeProjectType; import org.netbeans.modules.cnd.modelimpl.csm.core.ModelImpl; import org.netbeans.modules.cnd.modelimpl.repository.RepositoryUtils; +import org.netbeans.modules.cnd.test.BaseTestCase; +import org.netbeans.modules.cnd.test.CndCoreTestUtils; import org.openide.WizardDescriptor; import org.openide.util.Cancellable; import org.openide.util.Exceptions; @@ -68,24 +72,36 @@ * * @author Alexander Simon */ -public abstract class MakeProjectBase extends NbTestCase { +public abstract class MakeProjectBase extends BaseTestCase { private static final boolean OPTIMIZE_NATIVE_EXECUTIONS =true; + private static final boolean TRACE = true; public MakeProjectBase(String name) { super(name); - System.setProperty("org.netbeans.modules.cnd.makeproject.api.runprofiles", "true"); // NOI18N - System.setProperty("cnd.mode.unittest", "true"); + if (TRACE) { + System.setProperty("cnd.discovery.trace.projectimport", "true"); // NOI18N + } + //System.setProperty("org.netbeans.modules.cnd.makeproject.api.runprofiles", "true"); // NOI18N + //System.setProperty("cnd.mode.unittest", "true"); System.setProperty("cnd.make.project.creation.skip.notify.header.extension", "true"); - Logger.getLogger("org.netbeans.modules.editor.settings.storage.Utils").setLevel(Level.SEVERE); + //Logger.getLogger("org.netbeans.modules.editor.settings.storage.Utils").setLevel(Level.SEVERE); } @Override protected void setUp() throws Exception { super.setUp(); - MockServices.setServices(MakeProjectType.class); + //MockServices.setServices(MakeProjectType.class); startupModel(); } + @Override + protected List getServises() { + List list = new ArrayList(); + list.add(MakeProjectType.class); + list.addAll(super.getServises()); + return list; + } + private void startupModel() { ModelImpl model = (ModelImpl) CsmModelAccessor.getModel(); model.startup(); @@ -143,7 +159,11 @@ return path+"/configure"; } } else if ("realFlags".equals(name)) { - return "CFLAGS=\"-g3 -gdwarf-2\" CXXFLAGS=\"-g3 -gdwarf-2\""; + if (path.indexOf("cmake-")>0) { + return "CFLAGS=\"-g3 -gdwarf-2\" CXXFLAGS=\"-g3 -gdwarf-2\" CMAKE_BUILD_TYPE=Debug CMAKE_CXX_FLAGS_DEBUG=\"-g3 -gdwarf-2\" CMAKE_C_FLAGS_DEBUG=\"-g3 -gdwarf-2\""; + } else { + return "CFLAGS=\"-g3 -gdwarf-2\" CXXFLAGS=\"-g3 -gdwarf-2\""; + } } else if ("buildProject".equals(name)) { if (OPTIMIZE_NATIVE_EXECUTIONS && makeFile.exists() && findObjectFiles(path)) { // optimization on developer computer: @@ -204,33 +224,27 @@ return false; } - abstract void perform(CsmProject csmProject); + protected void perform(CsmProject csmProject) { + if (TRACE) { + System.err.println("Model content:"); + } + for (CsmFile file : csmProject.getAllFiles()) { + if (TRACE) { + System.err.println("\t"+file.getAbsolutePath()); + } + for(CsmInclude include : file.getIncludes()){ + assertTrue("Not resolved include directive "+include.getIncludeName()+" in file "+file.getAbsolutePath(), include.getIncludeFile() != null); + } + } + } private String download(String urlName, List additionalScripts) throws IOException { String zipName = urlName.substring(urlName.lastIndexOf('/')+1); String tarName = zipName.substring(0, zipName.lastIndexOf('.')); String packageName = tarName.substring(0, tarName.lastIndexOf('.')); + File fileDataPath = CndCoreTestUtils.getDownloadBase(); + String dataPath = fileDataPath.getAbsolutePath(); - String dataPath; - if (false) { - // local downloads - dataPath = getDataDir().getAbsolutePath(); - if (dataPath.endsWith("/data") || dataPath.endsWith("\\data")) { - dataPath = dataPath.substring(0, dataPath.length()-4)+"downloads"; - } - } else { - // downloads in tmp dir - dataPath = System.getProperty("java.io.tmpdir"); - if (dataPath.endsWith(File.separator)) { - dataPath += System.getProperty("user.name") + "-cnd-test-downloads"; - } else { - dataPath += File.separator + System.getProperty("user.name") + "-cnd-test-downloads"; - } - } - File fileDataPath = new File(dataPath); - if (!fileDataPath.exists()) { - fileDataPath.mkdirs(); - } String createdFolder = dataPath+"/"+packageName; final AtomicBoolean finish = new AtomicBoolean(false); ExecutionListener listener = new ExecutionListener() { diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTest.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTestCase.java rename from cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTest.java rename to cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTestCase.java --- a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTest.java +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTestCase.java @@ -41,47 +41,20 @@ import java.util.ArrayList; import java.util.List; -import org.netbeans.modules.cnd.api.model.CsmFile; -import org.netbeans.modules.cnd.api.model.CsmInclude; -import org.netbeans.modules.cnd.api.model.CsmProject; /** * * @author Alexander Simon */ -public class MysqlConnectorTest extends MakeProjectBase { - private static final boolean TRACE = true; +public class MysqlConnectorTestCase extends MakeProjectBase { - public MysqlConnectorTest() { - super("MysqlConnectorTest"); - if (TRACE) { - System.setProperty("cnd.discovery.trace.projectimport", "true"); // NOI18N - } - - } - - public void testCmake(){ - performTestProject("http://www.cmake.org/files/v2.6/cmake-2.6.4.tar.gz", null); + public MysqlConnectorTestCase() { + super("MysqlConnector"); } public void testMysqlConnector(){ List list = new ArrayList(); - list.add("../cmake-2.6.4/bin/cmake -G \"Unix Makefiles\" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS=\"-g3 -gdwarf-2\" -DCMAKE_C_FLAGS=\"-g3 -gdwarf-2\""); + list.add("../cmake-2.6.4/bin/cmake -G \"Unix Makefiles\" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS_DEBUG=\"-g3 -gdwarf-2\" -DCMAKE_C_FLAGS_DEBUG=\"-g3 -gdwarf-2\""); performTestProject("http://download.softagency.net/MySQL/Downloads/Connector-C/mysql-connector-c-6.0.1.tar.gz", list); } - - @Override - void perform(CsmProject csmProject) { - if (TRACE) { - System.err.println("Model content:"); - } - for (CsmFile file : csmProject.getAllFiles()) { - if (TRACE) { - System.err.println("\t"+file.getAbsolutePath()); - } - for(CsmInclude include : file.getIncludes()){ - assertTrue("Not resolved include directive "+include.getIncludeName()+" in file "+file.getAbsolutePath(), include.getIncludeFile() != null); - } - } - } } diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/PkgConfigTestCase.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/PkgConfigTestCase.java new file mode 100644 --- /dev/null +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/PkgConfigTestCase.java @@ -0,0 +1,55 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.cnd.discovery.project; + +/** + * + * @author Alexander Simon + */ +public class PkgConfigTestCase extends MakeProjectBase { + + public PkgConfigTestCase() { + super("PkgConfig"); + } + + public void testPkgConfig(){ + performTestProject("http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz", null); + } +} \ No newline at end of file diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTest.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTestCase.java rename from cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTest.java rename to cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTestCase.java --- a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTest.java +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTestCase.java @@ -39,56 +39,17 @@ package org.netbeans.modules.cnd.discovery.project; -import org.netbeans.modules.cnd.api.model.CsmFile; -import org.netbeans.modules.cnd.api.model.CsmInclude; -import org.netbeans.modules.cnd.api.model.CsmProject; -import org.openide.util.Utilities; - /** * * @author Alexander Simon */ -public class ProjectCreationTest extends MakeProjectBase { - private static final boolean TRACE = true; +public class ProjectCreationTestCase extends MakeProjectBase { - public ProjectCreationTest() { - super("ProjectCreationTest"); - if (TRACE) { - System.setProperty("cnd.discovery.trace.projectimport", "true"); // NOI18N - } - - } - - public void testPkgConfig(){ - performTestProject("http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz", null); - } - - public void testLiteSql(){ - if (Utilities.isWindows()) { - // make does not work on windows - // it start XWin and all hangs - // do anybody know how to make litesql on windows? - return; - } - performTestProject("http://www.mirrorservice.org/sites/download.sourceforge.net/pub/sourceforge/l/li/litesql/litesql-0.3.3.tar.gz", null); + public ProjectCreationTestCase() { + super("Tesseract"); } public void testTesseract(){ performTestProject("http://tesseract-ocr.googlecode.com/files/tesseract-2.03.tar.gz", null); } - - @Override - void perform(CsmProject csmProject) { - if (TRACE) { - System.err.println("Model content:"); - } - for (CsmFile file : csmProject.getAllFiles()) { - if (TRACE) { - System.err.println("\t"+file.getAbsolutePath()); - } - for(CsmInclude include : file.getIncludes()){ - assertTrue("Not resolved include directive "+include.getIncludeName()+" in file "+file.getAbsolutePath(), include.getIncludeFile() != null); - } - } - } } diff --git a/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/PkgConfigImpl.java b/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/PkgConfigImpl.java --- a/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/PkgConfigImpl.java +++ b/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/PkgConfigImpl.java @@ -174,7 +174,7 @@ return new ResolvedPathImpl(pairs.get(0).path, pairs.get(0).configurations); } else { String path = pairs.get(0).path; - Set set = new LinkedHashSet(); + Set set = new LinkedHashSet(); for(Pair p : pairs){ set.addAll(p.configurations); } @@ -339,7 +339,7 @@ } List list = res.get(key); if (list == null){ - list = new ArrayList(1); + list = new ArrayList(1); res.put(key, list); } if (!list.contains(pkg)){ diff --git a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java --- a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java +++ b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java @@ -47,7 +47,7 @@ import org.netbeans.modules.cnd.modelimpl.csm.core.ProjectBase; import org.netbeans.modules.cnd.modelimpl.csm.core.Tracer; import org.netbeans.modules.cnd.modelimpl.trace.TraceModelTestBase; -import org.openide.filesystems.FileUtil; +import org.netbeans.modules.cnd.test.CndCoreTestUtils; import org.openide.util.Exceptions; /** @@ -163,22 +163,8 @@ // tar xf pkgconfig-0.18.tar private List download() throws IOException{ List list = new ArrayList(); - String dataPath; - if (false) { - // local downloads - dataPath = getDataDir().getAbsolutePath(); - if (dataPath.endsWith("/data") || dataPath.endsWith("\\data")) { - dataPath = dataPath.substring(0, dataPath.length()-4)+"downloads"; - } - } else { - // downloads in tmp dir - dataPath = System.getProperty("java.io.tmpdir"); - if (dataPath.endsWith(File.separator)) { - dataPath += System.getProperty("user.name") + "-cnd-test-downloads"; - } else { - dataPath += File.separator + System.getProperty("user.name") + "-cnd-test-downloads"; - } - } + File fileDataPath = CndCoreTestUtils.getDownloadBase(); + String dataPath = fileDataPath.getAbsolutePath(); final AtomicBoolean finish = new AtomicBoolean(false); ExecutionListener listener = new ExecutionListener() { public void executionStarted() { diff --git a/cnd/test/unit/src/org/netbeans/modules/cnd/test/BaseTestCase.java b/cnd/test/unit/src/org/netbeans/modules/cnd/test/BaseTestCase.java --- a/cnd/test/unit/src/org/netbeans/modules/cnd/test/BaseTestCase.java +++ b/cnd/test/unit/src/org/netbeans/modules/cnd/test/BaseTestCase.java @@ -46,6 +46,9 @@ import java.io.FileWriter; import java.io.IOException; import java.io.Writer; +import java.util.ArrayList; +import java.util.List; +import java.util.Collections; import java.util.TreeSet; import java.util.logging.Level; import java.util.logging.Logger; @@ -168,7 +171,12 @@ Logger.getLogger("org.netbeans.modules.editor.settings.storage.Utils").setLevel(Level.SEVERE); System.setProperty("cnd.mode.unittest", "true"); - MockServices.setServices(MockMimeLookup.class); + List list = new ArrayList(); + list.add(MockMimeLookup.class); + for(Class cls : getServises()){ + list.add(cls); + } + MockServices.setServices(list.toArray(new Class[list.size()])); MimePath mimePath = MimePath.parse(MIMENames.CPLUSPLUS_MIME_TYPE); MockMimeLookup.setInstances(mimePath, new CCKit()); mimePath = MimePath.parse(MIMENames.HEADER_MIME_TYPE); @@ -179,6 +187,10 @@ MockMimeLookup.setInstances(mimePath, new FKit()); } + protected List getServises(){ + return Collections.emptyList(); + } + /** * Get the test method specific data file; * usually it is ${xtest.data}/${classname}/filename diff --git a/cnd/test/unit/src/org/netbeans/modules/cnd/test/CndCoreTestUtils.java b/cnd/test/unit/src/org/netbeans/modules/cnd/test/CndCoreTestUtils.java --- a/cnd/test/unit/src/org/netbeans/modules/cnd/test/CndCoreTestUtils.java +++ b/cnd/test/unit/src/org/netbeans/modules/cnd/test/CndCoreTestUtils.java @@ -54,6 +54,7 @@ import org.netbeans.editor.Utilities; import org.netbeans.junit.Manager; import org.openide.cookies.EditorCookie; +import org.openide.filesystems.FileUtil; import org.openide.loaders.DataObject; import org.openide.util.UserQuestionException; @@ -200,4 +201,24 @@ public static int getDocumentOffset(BaseDocument doc, int lineIndex, int colIndex) { return Utilities.getRowStartFromLineOffset(doc, lineIndex -1) + (colIndex - 1); } + + /** + * get common place for long living test base + * @return + */ + public static File getDownloadBase(){ + // downloads in tmp dir + String dataPath = System.getProperty("java.io.tmpdir"); + if (dataPath.endsWith(File.separator)) { + dataPath += System.getProperty("user.name") + "-cnd-test-downloads"; + } else { + dataPath += File.separator + System.getProperty("user.name") + "-cnd-test-downloads"; + } + File fileDataPath = new File(dataPath); + if (!fileDataPath.exists()) { + fileDataPath.mkdirs(); + } + return FileUtil.normalizeFile(fileDataPath); + } + } # HG changeset patch # User ffjre@netbeans.org # Date 1244038975 -14400 # Node ID 1e69353d02b277b6118382b612c1e420570c8a03 # Parent 602e8bb6473fa125aa12159c74b596a1c03d58c4 # Parent 13a6ef7f7847c32790e637ddc47c1e5bc30d2d2d Automated merge with http://hg.netbeans.org/main diff --git a/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java b/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java --- a/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java +++ b/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java @@ -78,7 +78,7 @@ } private static APTFileCacheEntry create(CharSequence filePath, boolean serial) { - return new APTFileCacheEntry(filePath, serial, serial ? new HashMap() : new ConcurrentHashMap(), new HashMap()); + return new APTFileCacheEntry(filePath, serial, serial ? new HashMap() : new ConcurrentHashMap(), serial ? new HashMap() : new ConcurrentHashMap()); } public boolean isSerial() { diff --git a/cnd.discovery/nbproject/project.xml b/cnd.discovery/nbproject/project.xml --- a/cnd.discovery/nbproject/project.xml +++ b/cnd.discovery/nbproject/project.xml @@ -190,6 +190,7 @@ org.netbeans.modules.cnd + org.netbeans.modules.cnd.remote @@ -222,6 +223,7 @@ org.netbeans.modules.editor.mimelookup + org.netbeans.modules.masterfs diff --git a/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/bridge/ProjectBridge.java b/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/bridge/ProjectBridge.java --- a/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/bridge/ProjectBridge.java +++ b/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/bridge/ProjectBridge.java @@ -147,7 +147,11 @@ public void checkForNewExtensions(Set needAdd){ Set extensions = new HashSet(); for(String name : needAdd){ - int i = name.lastIndexOf('.'); + int i = name.replace('\\', '/').lastIndexOf('/'); + if (i >= 0){ + name = name.substring(i+1); + } + i = name.lastIndexOf('.'); if (i > 0){ String extension = name.substring(i+1); if (extension.length()>0) { diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/CMakeTestCase.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/CMakeTestCase.java new file mode 100644 --- /dev/null +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/CMakeTestCase.java @@ -0,0 +1,56 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.cnd.discovery.project; + +/** + * + * @author Alexander Simon + */ +public class CMakeTestCase extends MakeProjectBase { + + public CMakeTestCase() { + super("CMake"); + } + + public void testCmake(){ + performTestProject("http://www.cmake.org/files/v2.6/cmake-2.6.4.tar.gz", null); + } +} + diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/DiscoverySuiteTest.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/DiscoverySuiteTest.java new file mode 100644 --- /dev/null +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/DiscoverySuiteTest.java @@ -0,0 +1,66 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.cnd.discovery.project; + +import junit.framework.Test; +import junit.framework.TestSuite; +import org.netbeans.modules.cnd.test.BaseTestSuite; + +/** + * + * @author Alexander Simon + */ +public class DiscoverySuiteTest extends BaseTestSuite { + + public DiscoverySuiteTest() { + super("C/C++ Discovery Test"); // NOI18N + + addTestSuite(PkgConfigTestCase.class); + addTestSuite(LiteSqlTestCase.class); + addTestSuite(ProjectCreationTestCase.class); + addTestSuite(CMakeTestCase.class); + addTestSuite(MysqlConnectorTestCase.class); + } + + public static Test suite() { + TestSuite suite = new DiscoverySuiteTest(); + return suite; + } +} diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/LiteSqlTestCase.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/LiteSqlTestCase.java new file mode 100644 --- /dev/null +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/LiteSqlTestCase.java @@ -0,0 +1,64 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.cnd.discovery.project; + +import org.openide.util.Utilities; + + +/** + * + * @author Alexander Simon + */ +public class LiteSqlTestCase extends MakeProjectBase { + + public LiteSqlTestCase() { + super("LiteSql"); + } + + public void testLiteSql(){ + if (Utilities.isWindows()) { + // make does not work on windows + // it start XWin and all hangs + // do anybody know how to make litesql on windows? + return; + } + performTestProject("http://www.mirrorservice.org/sites/download.sourceforge.net/pub/sourceforge/l/li/litesql/litesql-0.3.3.tar.gz", null); + } +} \ No newline at end of file diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java --- a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java @@ -41,6 +41,7 @@ import java.io.File; import java.io.IOException; +import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; @@ -48,9 +49,10 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ui.OpenProjects; import org.netbeans.junit.MockServices; -import org.netbeans.junit.NbTestCase; import org.netbeans.modules.cnd.api.execution.ExecutionListener; import org.netbeans.modules.cnd.api.execution.NativeExecutor; +import org.netbeans.modules.cnd.api.model.CsmFile; +import org.netbeans.modules.cnd.api.model.CsmInclude; import org.netbeans.modules.cnd.api.model.CsmModel; import org.netbeans.modules.cnd.api.model.CsmModelAccessor; import org.netbeans.modules.cnd.api.model.CsmProject; @@ -59,6 +61,8 @@ import org.netbeans.modules.cnd.makeproject.MakeProjectType; import org.netbeans.modules.cnd.modelimpl.csm.core.ModelImpl; import org.netbeans.modules.cnd.modelimpl.repository.RepositoryUtils; +import org.netbeans.modules.cnd.test.BaseTestCase; +import org.netbeans.modules.cnd.test.CndCoreTestUtils; import org.openide.WizardDescriptor; import org.openide.util.Cancellable; import org.openide.util.Exceptions; @@ -68,24 +72,36 @@ * * @author Alexander Simon */ -public abstract class MakeProjectBase extends NbTestCase { +public abstract class MakeProjectBase extends BaseTestCase { private static final boolean OPTIMIZE_NATIVE_EXECUTIONS =true; + private static final boolean TRACE = true; public MakeProjectBase(String name) { super(name); - System.setProperty("org.netbeans.modules.cnd.makeproject.api.runprofiles", "true"); // NOI18N - System.setProperty("cnd.mode.unittest", "true"); + if (TRACE) { + System.setProperty("cnd.discovery.trace.projectimport", "true"); // NOI18N + } + //System.setProperty("org.netbeans.modules.cnd.makeproject.api.runprofiles", "true"); // NOI18N + //System.setProperty("cnd.mode.unittest", "true"); System.setProperty("cnd.make.project.creation.skip.notify.header.extension", "true"); - Logger.getLogger("org.netbeans.modules.editor.settings.storage.Utils").setLevel(Level.SEVERE); + //Logger.getLogger("org.netbeans.modules.editor.settings.storage.Utils").setLevel(Level.SEVERE); } @Override protected void setUp() throws Exception { super.setUp(); - MockServices.setServices(MakeProjectType.class); + //MockServices.setServices(MakeProjectType.class); startupModel(); } + @Override + protected List getServises() { + List list = new ArrayList(); + list.add(MakeProjectType.class); + list.addAll(super.getServises()); + return list; + } + private void startupModel() { ModelImpl model = (ModelImpl) CsmModelAccessor.getModel(); model.startup(); @@ -143,7 +159,11 @@ return path+"/configure"; } } else if ("realFlags".equals(name)) { - return "CFLAGS=\"-g3 -gdwarf-2\" CXXFLAGS=\"-g3 -gdwarf-2\""; + if (path.indexOf("cmake-")>0) { + return "CFLAGS=\"-g3 -gdwarf-2\" CXXFLAGS=\"-g3 -gdwarf-2\" CMAKE_BUILD_TYPE=Debug CMAKE_CXX_FLAGS_DEBUG=\"-g3 -gdwarf-2\" CMAKE_C_FLAGS_DEBUG=\"-g3 -gdwarf-2\""; + } else { + return "CFLAGS=\"-g3 -gdwarf-2\" CXXFLAGS=\"-g3 -gdwarf-2\""; + } } else if ("buildProject".equals(name)) { if (OPTIMIZE_NATIVE_EXECUTIONS && makeFile.exists() && findObjectFiles(path)) { // optimization on developer computer: @@ -204,33 +224,27 @@ return false; } - abstract void perform(CsmProject csmProject); + protected void perform(CsmProject csmProject) { + if (TRACE) { + System.err.println("Model content:"); + } + for (CsmFile file : csmProject.getAllFiles()) { + if (TRACE) { + System.err.println("\t"+file.getAbsolutePath()); + } + for(CsmInclude include : file.getIncludes()){ + assertTrue("Not resolved include directive "+include.getIncludeName()+" in file "+file.getAbsolutePath(), include.getIncludeFile() != null); + } + } + } private String download(String urlName, List additionalScripts) throws IOException { String zipName = urlName.substring(urlName.lastIndexOf('/')+1); String tarName = zipName.substring(0, zipName.lastIndexOf('.')); String packageName = tarName.substring(0, tarName.lastIndexOf('.')); + File fileDataPath = CndCoreTestUtils.getDownloadBase(); + String dataPath = fileDataPath.getAbsolutePath(); - String dataPath; - if (false) { - // local downloads - dataPath = getDataDir().getAbsolutePath(); - if (dataPath.endsWith("/data") || dataPath.endsWith("\\data")) { - dataPath = dataPath.substring(0, dataPath.length()-4)+"downloads"; - } - } else { - // downloads in tmp dir - dataPath = System.getProperty("java.io.tmpdir"); - if (dataPath.endsWith(File.separator)) { - dataPath += System.getProperty("user.name") + "-cnd-test-downloads"; - } else { - dataPath += File.separator + System.getProperty("user.name") + "-cnd-test-downloads"; - } - } - File fileDataPath = new File(dataPath); - if (!fileDataPath.exists()) { - fileDataPath.mkdirs(); - } String createdFolder = dataPath+"/"+packageName; final AtomicBoolean finish = new AtomicBoolean(false); ExecutionListener listener = new ExecutionListener() { diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTest.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTestCase.java rename from cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTest.java rename to cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTestCase.java --- a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTest.java +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTestCase.java @@ -41,47 +41,20 @@ import java.util.ArrayList; import java.util.List; -import org.netbeans.modules.cnd.api.model.CsmFile; -import org.netbeans.modules.cnd.api.model.CsmInclude; -import org.netbeans.modules.cnd.api.model.CsmProject; /** * * @author Alexander Simon */ -public class MysqlConnectorTest extends MakeProjectBase { - private static final boolean TRACE = true; +public class MysqlConnectorTestCase extends MakeProjectBase { - public MysqlConnectorTest() { - super("MysqlConnectorTest"); - if (TRACE) { - System.setProperty("cnd.discovery.trace.projectimport", "true"); // NOI18N - } - - } - - public void testCmake(){ - performTestProject("http://www.cmake.org/files/v2.6/cmake-2.6.4.tar.gz", null); + public MysqlConnectorTestCase() { + super("MysqlConnector"); } public void testMysqlConnector(){ List list = new ArrayList(); - list.add("../cmake-2.6.4/bin/cmake -G \"Unix Makefiles\" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS=\"-g3 -gdwarf-2\" -DCMAKE_C_FLAGS=\"-g3 -gdwarf-2\""); + list.add("../cmake-2.6.4/bin/cmake -G \"Unix Makefiles\" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS_DEBUG=\"-g3 -gdwarf-2\" -DCMAKE_C_FLAGS_DEBUG=\"-g3 -gdwarf-2\""); performTestProject("http://download.softagency.net/MySQL/Downloads/Connector-C/mysql-connector-c-6.0.1.tar.gz", list); } - - @Override - void perform(CsmProject csmProject) { - if (TRACE) { - System.err.println("Model content:"); - } - for (CsmFile file : csmProject.getAllFiles()) { - if (TRACE) { - System.err.println("\t"+file.getAbsolutePath()); - } - for(CsmInclude include : file.getIncludes()){ - assertTrue("Not resolved include directive "+include.getIncludeName()+" in file "+file.getAbsolutePath(), include.getIncludeFile() != null); - } - } - } } diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/PkgConfigTestCase.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/PkgConfigTestCase.java new file mode 100644 --- /dev/null +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/PkgConfigTestCase.java @@ -0,0 +1,55 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.cnd.discovery.project; + +/** + * + * @author Alexander Simon + */ +public class PkgConfigTestCase extends MakeProjectBase { + + public PkgConfigTestCase() { + super("PkgConfig"); + } + + public void testPkgConfig(){ + performTestProject("http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz", null); + } +} \ No newline at end of file diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTest.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTestCase.java rename from cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTest.java rename to cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTestCase.java --- a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTest.java +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTestCase.java @@ -39,56 +39,17 @@ package org.netbeans.modules.cnd.discovery.project; -import org.netbeans.modules.cnd.api.model.CsmFile; -import org.netbeans.modules.cnd.api.model.CsmInclude; -import org.netbeans.modules.cnd.api.model.CsmProject; -import org.openide.util.Utilities; - /** * * @author Alexander Simon */ -public class ProjectCreationTest extends MakeProjectBase { - private static final boolean TRACE = true; +public class ProjectCreationTestCase extends MakeProjectBase { - public ProjectCreationTest() { - super("ProjectCreationTest"); - if (TRACE) { - System.setProperty("cnd.discovery.trace.projectimport", "true"); // NOI18N - } - - } - - public void testPkgConfig(){ - performTestProject("http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz", null); - } - - public void testLiteSql(){ - if (Utilities.isWindows()) { - // make does not work on windows - // it start XWin and all hangs - // do anybody know how to make litesql on windows? - return; - } - performTestProject("http://www.mirrorservice.org/sites/download.sourceforge.net/pub/sourceforge/l/li/litesql/litesql-0.3.3.tar.gz", null); + public ProjectCreationTestCase() { + super("Tesseract"); } public void testTesseract(){ performTestProject("http://tesseract-ocr.googlecode.com/files/tesseract-2.03.tar.gz", null); } - - @Override - void perform(CsmProject csmProject) { - if (TRACE) { - System.err.println("Model content:"); - } - for (CsmFile file : csmProject.getAllFiles()) { - if (TRACE) { - System.err.println("\t"+file.getAbsolutePath()); - } - for(CsmInclude include : file.getIncludes()){ - assertTrue("Not resolved include directive "+include.getIncludeName()+" in file "+file.getAbsolutePath(), include.getIncludeFile() != null); - } - } - } } diff --git a/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/PkgConfigImpl.java b/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/PkgConfigImpl.java --- a/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/PkgConfigImpl.java +++ b/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/PkgConfigImpl.java @@ -174,7 +174,7 @@ return new ResolvedPathImpl(pairs.get(0).path, pairs.get(0).configurations); } else { String path = pairs.get(0).path; - Set set = new LinkedHashSet(); + Set set = new LinkedHashSet(); for(Pair p : pairs){ set.addAll(p.configurations); } @@ -339,7 +339,7 @@ } List list = res.get(key); if (list == null){ - list = new ArrayList(1); + list = new ArrayList(1); res.put(key, list); } if (!list.contains(pkg)){ diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java @@ -135,11 +135,11 @@ APTFile aptLight = inclFileOwner.getAPTLight(csmFile); if (aptLight != null) { APTPreprocHandler preprocHandler = getPreprocHandler(); - APTFileCacheEntry cacheEntry = csmFile.getAPTCacheEntry(preprocHandler, false); + APTFileCacheEntry cacheEntry = csmFile.getAPTCacheEntry(preprocHandler, true); APTWalker walker = new APTRestorePreprocStateWalker(getStartProject(), aptLight, csmFile, preprocHandler,cacheEntry); walker.visit(); - // remember walk info - csmFile.setAPTCacheEntry(preprocHandler, cacheEntry, false); + // does not remember walk info to safe memory + // csmFile.setAPTCacheEntry(preprocHandler, cacheEntry, false); } else { // expected #included file was deleted csmFile = null; diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java @@ -70,10 +70,10 @@ try { APTFile apt = APTDriver.getInstance().findAPTLight(new FileBufferFile(new File(resolvedPath.getPath().toString()))); APTPreprocHandler preprocHandler = getPreprocHandler(); - APTFileCacheEntry cache = APTFileCacheManager.getEntry(resolvedPath.getPath(),preprocHandler, false); + APTFileCacheEntry cache = APTFileCacheManager.getEntry(resolvedPath.getPath(),preprocHandler, true); createIncludeWalker(apt, this, resolvedPath.getPath(), cache).visit(); - // remember walk - APTFileCacheManager.setAPTCacheEntry(resolvedPath.getPath(), preprocHandler, cache, false); + // does not remember walk to safe memory + // APTFileCacheManager.setAPTCacheEntry(resolvedPath.getPath(), preprocHandler, cache, false); } catch (FileNotFoundException ex) { APTUtils.LOG.log(Level.WARNING, "APTSelfWalker: file {0} not found", new Object[] {resolvedPath.getPath()});// NOI18N DiagnosticExceptoins.register(ex); @@ -95,4 +95,5 @@ protected boolean hasIncludeActionSideEffects() { return false; } -} \ No newline at end of file +} + diff --git a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java --- a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java +++ b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java @@ -47,7 +47,7 @@ import org.netbeans.modules.cnd.modelimpl.csm.core.ProjectBase; import org.netbeans.modules.cnd.modelimpl.csm.core.Tracer; import org.netbeans.modules.cnd.modelimpl.trace.TraceModelTestBase; -import org.openide.filesystems.FileUtil; +import org.netbeans.modules.cnd.test.CndCoreTestUtils; import org.openide.util.Exceptions; /** @@ -163,22 +163,8 @@ // tar xf pkgconfig-0.18.tar private List download() throws IOException{ List list = new ArrayList(); - String dataPath; - if (false) { - // local downloads - dataPath = getDataDir().getAbsolutePath(); - if (dataPath.endsWith("/data") || dataPath.endsWith("\\data")) { - dataPath = dataPath.substring(0, dataPath.length()-4)+"downloads"; - } - } else { - // downloads in tmp dir - dataPath = System.getProperty("java.io.tmpdir"); - if (dataPath.endsWith(File.separator)) { - dataPath += System.getProperty("user.name") + "-cnd-test-downloads"; - } else { - dataPath += File.separator + System.getProperty("user.name") + "-cnd-test-downloads"; - } - } + File fileDataPath = CndCoreTestUtils.getDownloadBase(); + String dataPath = fileDataPath.getAbsolutePath(); final AtomicBoolean finish = new AtomicBoolean(false); ExecutionListener listener = new ExecutionListener() { public void executionStarted() { @@ -188,19 +174,19 @@ } }; NativeExecutor ne = null; - File file = new File(dataPath + "/pkgconfig-0.18"); + File file = new File(dataPath + "/pkg-config-0.23"); if (!file.exists()){ file.mkdirs(); } if (file.list().length == 0){ ne = new NativeExecutor(dataPath,"wget", - "http://pkgconfig.freedesktop.org/releases/pkgconfig-0.18.tar.gz",new String[0],"wget","run",false,false); + "http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz",new String[0],"wget","run",false,false); waitExecution(ne, listener, finish); ne = new NativeExecutor(dataPath,"gzip", - "-d pkgconfig-0.18.tar.gz",new String[0],"gzip","run",false,false); + "-d pkg-config-0.23.tar.gz",new String[0],"gzip","run",false,false); waitExecution(ne, listener, finish); ne = new NativeExecutor(dataPath,"tar", - "xf pkgconfig-0.18.tar",new String[0],"tar","run",false,false); + "xf pkg-config-0.23.tar",new String[0],"tar","run",false,false); waitExecution(ne, listener, finish); } @@ -219,7 +205,7 @@ "xf litesql-0.3.3.tar",new String[0],"tar","run",false,false); waitExecution(ne, listener, finish); } - list.add(dataPath + "/pkgconfig-0.18"); //NOI18N + list.add(dataPath + "/pkg-config-0.23"); //NOI18N list.add(dataPath + "/litesql-0.3.3"); //NOI18N for(String f : list){ file = new File(f); @@ -227,7 +213,7 @@ } list = expandAndSort(list); list.add("-DHAVE_CONFIG_H"); - list.add("-I"+dataPath + "/pkgconfig-0.18"); + list.add("-I"+dataPath + "/pkg-config-0.23"); list.add("-I"+dataPath + "/litesql-0.3.3"); return list; } diff --git a/cnd/test/unit/src/org/netbeans/modules/cnd/test/BaseTestCase.java b/cnd/test/unit/src/org/netbeans/modules/cnd/test/BaseTestCase.java --- a/cnd/test/unit/src/org/netbeans/modules/cnd/test/BaseTestCase.java +++ b/cnd/test/unit/src/org/netbeans/modules/cnd/test/BaseTestCase.java @@ -46,6 +46,9 @@ import java.io.FileWriter; import java.io.IOException; import java.io.Writer; +import java.util.ArrayList; +import java.util.List; +import java.util.Collections; import java.util.TreeSet; import java.util.logging.Level; import java.util.logging.Logger; @@ -168,7 +171,12 @@ Logger.getLogger("org.netbeans.modules.editor.settings.storage.Utils").setLevel(Level.SEVERE); System.setProperty("cnd.mode.unittest", "true"); - MockServices.setServices(MockMimeLookup.class); + List list = new ArrayList(); + list.add(MockMimeLookup.class); + for(Class cls : getServises()){ + list.add(cls); + } + MockServices.setServices(list.toArray(new Class[list.size()])); MimePath mimePath = MimePath.parse(MIMENames.CPLUSPLUS_MIME_TYPE); MockMimeLookup.setInstances(mimePath, new CCKit()); mimePath = MimePath.parse(MIMENames.HEADER_MIME_TYPE); @@ -179,6 +187,10 @@ MockMimeLookup.setInstances(mimePath, new FKit()); } + protected List getServises(){ + return Collections.emptyList(); + } + /** * Get the test method specific data file; * usually it is ${xtest.data}/${classname}/filename diff --git a/cnd/test/unit/src/org/netbeans/modules/cnd/test/CndCoreTestUtils.java b/cnd/test/unit/src/org/netbeans/modules/cnd/test/CndCoreTestUtils.java --- a/cnd/test/unit/src/org/netbeans/modules/cnd/test/CndCoreTestUtils.java +++ b/cnd/test/unit/src/org/netbeans/modules/cnd/test/CndCoreTestUtils.java @@ -54,6 +54,7 @@ import org.netbeans.editor.Utilities; import org.netbeans.junit.Manager; import org.openide.cookies.EditorCookie; +import org.openide.filesystems.FileUtil; import org.openide.loaders.DataObject; import org.openide.util.UserQuestionException; @@ -200,4 +201,24 @@ public static int getDocumentOffset(BaseDocument doc, int lineIndex, int colIndex) { return Utilities.getRowStartFromLineOffset(doc, lineIndex -1) + (colIndex - 1); } + + /** + * get common place for long living test base + * @return + */ + public static File getDownloadBase(){ + // downloads in tmp dir + String dataPath = System.getProperty("java.io.tmpdir"); + if (dataPath.endsWith(File.separator)) { + dataPath += System.getProperty("user.name") + "-cnd-test-downloads"; + } else { + dataPath += File.separator + System.getProperty("user.name") + "-cnd-test-downloads"; + } + File fileDataPath = new File(dataPath); + if (!fileDataPath.exists()) { + fileDataPath.mkdirs(); + } + return FileUtil.normalizeFile(fileDataPath); + } + } diff --git a/javascript.editing/src/org/netbeans/modules/javascript/editing/embedding/JsEmbeddingProvider.java b/javascript.editing/src/org/netbeans/modules/javascript/editing/embedding/JsEmbeddingProvider.java --- a/javascript.editing/src/org/netbeans/modules/javascript/editing/embedding/JsEmbeddingProvider.java +++ b/javascript.editing/src/org/netbeans/modules/javascript/editing/embedding/JsEmbeddingProvider.java @@ -583,7 +583,8 @@ //need to adjust the last embedding //1. remove the embedding from the list - assert embeddings.remove(state.lastInlinedJavscriptEmbedding); + boolean removed = embeddings.remove(state.lastInlinedJavscriptEmbedding); + assert removed; //2. create new embedding with the adjusted length embeddings.add(snapshot.create(sourceStart, sourceLength, JsTokenId.JAVASCRIPT_MIME_TYPE)); # HG changeset patch # User mkuchtiak@netbeans.org # Date 1244040073 -7200 # Node ID b41cebe87d521b7c5ff41acc987cafb6625852ac # Parent c53edfe564c70a8db9bc18572d477ae1f0bcf6ca fixing test problem diff --git a/websvc.jaxws21/nbproject/project.properties b/websvc.jaxws21/nbproject/project.properties --- a/websvc.jaxws21/nbproject/project.properties +++ b/websvc.jaxws21/nbproject/project.properties @@ -51,6 +51,7 @@ modules/ext/jaxws21/sjsxp.jar,\ modules/ext/jaxws21/stax-ex.jar,\ modules/ext/jaxws21/streambuffer.jar,\ + docs/jaxws-2_1-api-doc.zip release.external/jaxws-2.1.zip!/FastInfoset.jar=modules/ext/jaxws21/FastInfoset.jar release.external/jaxws-2.1.zip!/http.jar=modules/ext/jaxws21/http.jar # HG changeset patch # User mkuchtiak@netbeans.org # Date 1244040691 -7200 # Node ID 5144d9c8c6fda9d09d39aee1d967053df6d51fe4 # Parent b41cebe87d521b7c5ff41acc987cafb6625852ac splitng JAXB library to API and SPI modules diff --git a/compapp.projects.jbi/nbproject/project.xml b/compapp.projects.jbi/nbproject/project.xml --- a/compapp.projects.jbi/nbproject/project.xml +++ b/compapp.projects.jbi/nbproject/project.xml @@ -249,25 +249,16 @@ 1.3 - - org.netbeans.modules.xml.retriever diff --git a/deployment.deviceanywhere/nbproject/project.xml b/deployment.deviceanywhere/nbproject/project.xml --- a/deployment.deviceanywhere/nbproject/project.xml +++ b/deployment.deviceanywhere/nbproject/project.xml @@ -122,6 +122,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.openide.awt diff --git a/identity.profile.api/nbproject/project.xml b/identity.profile.api/nbproject/project.xml --- a/identity.profile.api/nbproject/project.xml +++ b/identity.profile.api/nbproject/project.xml @@ -101,6 +101,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.openide.util diff --git a/libs.jaxb/manifest.mf b/libs.jaxb/manifest.mf --- a/libs.jaxb/manifest.mf +++ b/libs.jaxb/manifest.mf @@ -3,6 +3,5 @@ OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jaxb/Bundle.properties OpenIDE-Module-Specification-Version: 1.5 OpenIDE-Module-Layer: org/netbeans/libs/jaxb/layer.xml -AutoUpdate-Show-In-Client: false +OpenIDE-Module-Provides: com.sun.xml.bind OpenIDE-Module-Requires: org.openide.modules.ModuleFormat2 -OpenIDE-Module-Hide-Classpath-Packages: javax.xml.bind.**, javax.xml.stream.** diff --git a/libs.jaxb/nbproject/project.properties b/libs.jaxb/nbproject/project.properties --- a/libs.jaxb/nbproject/project.properties +++ b/libs.jaxb/nbproject/project.properties @@ -37,17 +37,13 @@ # Version 2 license, then the option applies only if the new code is # made subject to such option by the copyright holder. +is.autoload=true + jnlp.indirect.jars=\ - modules/ext/jaxb/activation.jar,\ - modules/ext/jaxb/api/jaxb-api.jar,\ modules/ext/jaxb/jaxb-impl.jar,\ - modules/ext/jaxb/jaxb-xjc.jar,\ - modules/ext/jaxb/api/jsr173_api.jar + modules/ext/jaxb/jaxb-xjc.jar -release.external/activation.jar=modules/ext/jaxb/activation.jar -release.external/jaxb-api.jar=modules/ext/jaxb/api/jaxb-api.jar release.external/jaxb-impl.jar=modules/ext/jaxb/jaxb-impl.jar release.external/jaxb-xjc.jar=modules/ext/jaxb/jaxb-xjc.jar -release.external/jsr173_api.jar=modules/ext/jaxb/api/jsr173_api.jar sigtest.gen.fail.on.error=false diff --git a/libs.jaxb/nbproject/project.xml b/libs.jaxb/nbproject/project.xml --- a/libs.jaxb/nbproject/project.xml +++ b/libs.jaxb/nbproject/project.xml @@ -4,7 +4,15 @@ org.netbeans.libs.jaxb - + + + org.netbeans.modules.xml.jaxb.api + + 1 + 1.0 + + + org.netbeans.modules.aspect.editor org.netbeans.modules.compapp.projects.jbi @@ -81,14 +89,6 @@ com.sun.xml.bind.v2.schemagen.episode com.sun.xml.bind.v2.schemagen.xmlschema com.sun.xml.bind.v2.util - javax.activation - javax.xml.bind - javax.xml.bind.annotation - javax.xml.bind.annotation.adapters - javax.xml.bind.attachment - javax.xml.bind.helpers - javax.xml.bind.util - javax.xml.stream com.sun.codemodel com.sun.dtdparser com.sun.istack @@ -99,22 +99,13 @@ com.sun.org.apache.xml.internal.resolver.readers com.sun.org.apache.xml.internal.resolver.tools com.sun.tools.xjc - - - ext/jaxb/activation.jar - - - ext/jaxb/api/jaxb-api.jar - + ext/jaxb/jaxb-impl.jar ext/jaxb/jaxb-xjc.jar - - ext/jaxb/api/jsr173_api.jar - diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties @@ -397,6 +397,7 @@ xml.axi,\ xml.catalog,\ xml.core,\ + xml.jaxb.api,\ xml.lexer,\ xml.multiview,\ xml.retriever,\ diff --git a/uml.drawingarea/nbproject/project.xml b/uml.drawingarea/nbproject/project.xml --- a/uml.drawingarea/nbproject/project.xml +++ b/uml.drawingarea/nbproject/project.xml @@ -153,6 +153,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.netbeans.spi.navigator diff --git a/uml/nbproject/project.xml b/uml/nbproject/project.xml --- a/uml/nbproject/project.xml +++ b/uml/nbproject/project.xml @@ -135,6 +135,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.openide.actions diff --git a/visualweb.websvcmgr/nbproject/project.xml b/visualweb.websvcmgr/nbproject/project.xml --- a/visualweb.websvcmgr/nbproject/project.xml +++ b/visualweb.websvcmgr/nbproject/project.xml @@ -328,6 +328,15 @@ 1.0 + + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + diff --git a/websvc.jaxws21/nbproject/project.xml b/websvc.jaxws21/nbproject/project.xml --- a/websvc.jaxws21/nbproject/project.xml +++ b/websvc.jaxws21/nbproject/project.xml @@ -47,6 +47,13 @@ org.netbeans.modules.websvc.jaxws21 + org.netbeans.libs.jaxb + + 1 + 1.3 + + + org.netbeans.modules.websvc.jaxws21api @@ -56,12 +63,10 @@ - org.netbeans.libs.jaxb - - + org.netbeans.modules.xml.jaxb.api 1 - 1.3 + 1.0 diff --git a/websvc.jaxws21api/nbproject/project.xml b/websvc.jaxws21api/nbproject/project.xml --- a/websvc.jaxws21api/nbproject/project.xml +++ b/websvc.jaxws21api/nbproject/project.xml @@ -48,13 +48,18 @@ org.netbeans.libs.jaxb - - 1 1.3 + + org.netbeans.modules.xml.jaxb.api + + 1 + 1.0 + + javax.annotation diff --git a/websvc.manager/nbproject/project.xml b/websvc.manager/nbproject/project.xml --- a/websvc.manager/nbproject/project.xml +++ b/websvc.manager/nbproject/project.xml @@ -91,6 +91,15 @@ + org.netbeans.libs.jaxb + + + + 1 + 1.3 + + + org.netbeans.modules.editor @@ -161,15 +170,6 @@ - org.netbeans.libs.jaxb - - - - 1 - 1.3 - - - org.netbeans.modules.websvc.jaxws21 @@ -197,6 +197,15 @@ + org.netbeans.modules.websvc.jaxwsmodelapi + + + + 1 + 1.0 + + + org.netbeans.modules.websvc.saas.api @@ -205,6 +214,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.netbeans.modules.xml.retriever @@ -309,15 +327,6 @@ 6.5 - - org.netbeans.modules.websvc.jaxwsmodelapi - - - - 1 - 1.0 - - diff --git a/websvc.metro.model/nbproject/project.xml b/websvc.metro.model/nbproject/project.xml --- a/websvc.metro.model/nbproject/project.xml +++ b/websvc.metro.model/nbproject/project.xml @@ -160,6 +160,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.netbeans.modules.xml.retriever diff --git a/websvc.saas.api/nbproject/project.xml b/websvc.saas.api/nbproject/project.xml --- a/websvc.saas.api/nbproject/project.xml +++ b/websvc.saas.api/nbproject/project.xml @@ -60,6 +60,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.netbeans.modules.xml.retriever diff --git a/websvc.saas.codegen.j2ee/nbproject/project.xml b/websvc.saas.codegen.j2ee/nbproject/project.xml --- a/websvc.saas.codegen.j2ee/nbproject/project.xml +++ b/websvc.saas.codegen.j2ee/nbproject/project.xml @@ -152,6 +152,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.netbeans.modules.xml.schema.model diff --git a/websvc.saas.codegen.java/nbproject/project.xml b/websvc.saas.codegen.java/nbproject/project.xml --- a/websvc.saas.codegen.java/nbproject/project.xml +++ b/websvc.saas.codegen.java/nbproject/project.xml @@ -137,6 +137,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.netbeans.modules.xml.wsdl.model diff --git a/websvc.saas.codegen.php/nbproject/project.xml b/websvc.saas.codegen.php/nbproject/project.xml --- a/websvc.saas.codegen.php/nbproject/project.xml +++ b/websvc.saas.codegen.php/nbproject/project.xml @@ -40,6 +40,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.openide.filesystems diff --git a/websvc.saas.codegen/nbproject/project.xml b/websvc.saas.codegen/nbproject/project.xml --- a/websvc.saas.codegen/nbproject/project.xml +++ b/websvc.saas.codegen/nbproject/project.xml @@ -104,6 +104,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.netbeans.modules.xml.retriever diff --git a/websvc.saas.services.strikeiron/nbproject/project.xml b/websvc.saas.services.strikeiron/nbproject/project.xml --- a/websvc.saas.services.strikeiron/nbproject/project.xml +++ b/websvc.saas.services.strikeiron/nbproject/project.xml @@ -41,6 +41,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.openide.actions diff --git a/websvc.saas.ui/nbproject/project.xml b/websvc.saas.ui/nbproject/project.xml --- a/websvc.saas.ui/nbproject/project.xml +++ b/websvc.saas.ui/nbproject/project.xml @@ -50,6 +50,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.netbeans.modules.xml.wsdl.model diff --git a/xml.jaxb.api/build.xml b/xml.jaxb.api/build.xml new file mode 100644 --- /dev/null +++ b/xml.jaxb.api/build.xml @@ -0,0 +1,5 @@ + + + Builds, tests, and runs the project org.netbeans.libs.jaxb + + diff --git a/xml.jaxb.api/manifest.mf b/xml.jaxb.api/manifest.mf new file mode 100644 --- /dev/null +++ b/xml.jaxb.api/manifest.mf @@ -0,0 +1,6 @@ +Manifest-Version: 1.0 +OpenIDE-Module: org.netbeans.modules.xml.jaxb.api/1 +OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/jaxb/api/Bundle.properties +OpenIDE-Module-Specification-Version: 1.0 +OpenIDE-Module-Needs: com.sun.xml.bind +OpenIDE-Module-Hide-Classpath-Packages: javax.xml.bind.**, javax.xml.stream.** diff --git a/xml.jaxb.api/nbproject/project.properties b/xml.jaxb.api/nbproject/project.properties new file mode 100644 --- /dev/null +++ b/xml.jaxb.api/nbproject/project.properties @@ -0,0 +1,51 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this +# particular file as subject to the "Classpath" exception as provided +# by Sun in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + +is.autoload=true + +jnlp.indirect.jars=\ + modules/ext/jaxb/activation.jar,\ + modules/ext/jaxb/api/jaxb-api.jar,\ + modules/ext/jaxb/api/jsr173_api.jar + +release.../libs.jaxb/external/activation.jar=modules/ext/jaxb/activation.jar +release.../libs.jaxb/external/jaxb-api.jar=modules/ext/jaxb/api/jaxb-api.jar +release.../libs.jaxb/external/jsr173_api.jar=modules/ext/jaxb/api/jsr173_api.jar + +sigtest.gen.fail.on.error=false diff --git a/xml.jaxb.api/nbproject/project.xml b/xml.jaxb.api/nbproject/project.xml new file mode 100644 --- /dev/null +++ b/xml.jaxb.api/nbproject/project.xml @@ -0,0 +1,31 @@ + + + org.netbeans.modules.apisupport.project + + + org.netbeans.modules.xml.jaxb.api + + + javax.activation + javax.xml.bind + javax.xml.bind.annotation + javax.xml.bind.annotation.adapters + javax.xml.bind.attachment + javax.xml.bind.helpers + javax.xml.bind.util + javax.xml.stream + javax.xml.stream.events + javax.xml.stream.util + + + ext/jaxb/activation.jar + + + ext/jaxb/api/jaxb-api.jar + + + ext/jaxb/api/jsr173_api.jar + + + + diff --git a/xml.jaxb.api/src/org/netbeans/modules/xml/jaxb/api/Bundle.properties b/xml.jaxb.api/src/org/netbeans/modules/xml/jaxb/api/Bundle.properties new file mode 100644 --- /dev/null +++ b/xml.jaxb.api/src/org/netbeans/modules/xml/jaxb/api/Bundle.properties @@ -0,0 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this +# particular file as subject to the "Classpath" exception as provided +# by Sun in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. +# Sample ResourceBundle properties file + +OpenIDE-Module-Name=JAXB 2.1 API + # HG changeset patch # User mkuchtiak@netbeans.org # Date 1244040862 -7200 # Node ID 7d12c3fb7b042e718d36161958c29002a2085b91 # Parent 1e69353d02b277b6118382b612c1e420570c8a03 # Parent 5144d9c8c6fda9d09d39aee1d967053df6d51fe4 Automated merge with http://hg.netbeans.org/main/ diff --git a/compapp.projects.jbi/nbproject/project.xml b/compapp.projects.jbi/nbproject/project.xml --- a/compapp.projects.jbi/nbproject/project.xml +++ b/compapp.projects.jbi/nbproject/project.xml @@ -249,25 +249,16 @@ 1.3 - - org.netbeans.modules.xml.retriever diff --git a/deployment.deviceanywhere/nbproject/project.xml b/deployment.deviceanywhere/nbproject/project.xml --- a/deployment.deviceanywhere/nbproject/project.xml +++ b/deployment.deviceanywhere/nbproject/project.xml @@ -122,6 +122,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.openide.awt diff --git a/identity.profile.api/nbproject/project.xml b/identity.profile.api/nbproject/project.xml --- a/identity.profile.api/nbproject/project.xml +++ b/identity.profile.api/nbproject/project.xml @@ -101,6 +101,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.openide.util diff --git a/libs.jaxb/manifest.mf b/libs.jaxb/manifest.mf --- a/libs.jaxb/manifest.mf +++ b/libs.jaxb/manifest.mf @@ -3,6 +3,5 @@ OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jaxb/Bundle.properties OpenIDE-Module-Specification-Version: 1.5 OpenIDE-Module-Layer: org/netbeans/libs/jaxb/layer.xml -AutoUpdate-Show-In-Client: false +OpenIDE-Module-Provides: com.sun.xml.bind OpenIDE-Module-Requires: org.openide.modules.ModuleFormat2 -OpenIDE-Module-Hide-Classpath-Packages: javax.xml.bind.**, javax.xml.stream.** diff --git a/libs.jaxb/nbproject/project.properties b/libs.jaxb/nbproject/project.properties --- a/libs.jaxb/nbproject/project.properties +++ b/libs.jaxb/nbproject/project.properties @@ -37,17 +37,13 @@ # Version 2 license, then the option applies only if the new code is # made subject to such option by the copyright holder. +is.autoload=true + jnlp.indirect.jars=\ - modules/ext/jaxb/activation.jar,\ - modules/ext/jaxb/api/jaxb-api.jar,\ modules/ext/jaxb/jaxb-impl.jar,\ - modules/ext/jaxb/jaxb-xjc.jar,\ - modules/ext/jaxb/api/jsr173_api.jar + modules/ext/jaxb/jaxb-xjc.jar -release.external/activation.jar=modules/ext/jaxb/activation.jar -release.external/jaxb-api.jar=modules/ext/jaxb/api/jaxb-api.jar release.external/jaxb-impl.jar=modules/ext/jaxb/jaxb-impl.jar release.external/jaxb-xjc.jar=modules/ext/jaxb/jaxb-xjc.jar -release.external/jsr173_api.jar=modules/ext/jaxb/api/jsr173_api.jar sigtest.gen.fail.on.error=false diff --git a/libs.jaxb/nbproject/project.xml b/libs.jaxb/nbproject/project.xml --- a/libs.jaxb/nbproject/project.xml +++ b/libs.jaxb/nbproject/project.xml @@ -4,7 +4,15 @@ org.netbeans.libs.jaxb - + + + org.netbeans.modules.xml.jaxb.api + + 1 + 1.0 + + + org.netbeans.modules.aspect.editor org.netbeans.modules.compapp.projects.jbi @@ -81,14 +89,6 @@ com.sun.xml.bind.v2.schemagen.episode com.sun.xml.bind.v2.schemagen.xmlschema com.sun.xml.bind.v2.util - javax.activation - javax.xml.bind - javax.xml.bind.annotation - javax.xml.bind.annotation.adapters - javax.xml.bind.attachment - javax.xml.bind.helpers - javax.xml.bind.util - javax.xml.stream com.sun.codemodel com.sun.dtdparser com.sun.istack @@ -99,22 +99,13 @@ com.sun.org.apache.xml.internal.resolver.readers com.sun.org.apache.xml.internal.resolver.tools com.sun.tools.xjc - - - ext/jaxb/activation.jar - - - ext/jaxb/api/jaxb-api.jar - + ext/jaxb/jaxb-impl.jar ext/jaxb/jaxb-xjc.jar - - ext/jaxb/api/jsr173_api.jar - diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties @@ -397,6 +397,7 @@ xml.axi,\ xml.catalog,\ xml.core,\ + xml.jaxb.api,\ xml.lexer,\ xml.multiview,\ xml.retriever,\ diff --git a/uml.drawingarea/nbproject/project.xml b/uml.drawingarea/nbproject/project.xml --- a/uml.drawingarea/nbproject/project.xml +++ b/uml.drawingarea/nbproject/project.xml @@ -153,6 +153,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.netbeans.spi.navigator diff --git a/uml/nbproject/project.xml b/uml/nbproject/project.xml --- a/uml/nbproject/project.xml +++ b/uml/nbproject/project.xml @@ -135,6 +135,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.openide.actions diff --git a/visualweb.websvcmgr/nbproject/project.xml b/visualweb.websvcmgr/nbproject/project.xml --- a/visualweb.websvcmgr/nbproject/project.xml +++ b/visualweb.websvcmgr/nbproject/project.xml @@ -328,6 +328,15 @@ 1.0 + + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + diff --git a/websvc.jaxws21/nbproject/project.properties b/websvc.jaxws21/nbproject/project.properties --- a/websvc.jaxws21/nbproject/project.properties +++ b/websvc.jaxws21/nbproject/project.properties @@ -51,6 +51,7 @@ modules/ext/jaxws21/sjsxp.jar,\ modules/ext/jaxws21/stax-ex.jar,\ modules/ext/jaxws21/streambuffer.jar,\ + docs/jaxws-2_1-api-doc.zip release.external/jaxws-2.1.zip!/FastInfoset.jar=modules/ext/jaxws21/FastInfoset.jar release.external/jaxws-2.1.zip!/http.jar=modules/ext/jaxws21/http.jar diff --git a/websvc.jaxws21/nbproject/project.xml b/websvc.jaxws21/nbproject/project.xml --- a/websvc.jaxws21/nbproject/project.xml +++ b/websvc.jaxws21/nbproject/project.xml @@ -47,6 +47,13 @@ org.netbeans.modules.websvc.jaxws21 + org.netbeans.libs.jaxb + + 1 + 1.3 + + + org.netbeans.modules.websvc.jaxws21api @@ -56,12 +63,10 @@ - org.netbeans.libs.jaxb - - + org.netbeans.modules.xml.jaxb.api 1 - 1.3 + 1.0 diff --git a/websvc.jaxws21api/nbproject/project.xml b/websvc.jaxws21api/nbproject/project.xml --- a/websvc.jaxws21api/nbproject/project.xml +++ b/websvc.jaxws21api/nbproject/project.xml @@ -48,13 +48,18 @@ org.netbeans.libs.jaxb - - 1 1.3 + + org.netbeans.modules.xml.jaxb.api + + 1 + 1.0 + + javax.annotation diff --git a/websvc.manager/nbproject/project.xml b/websvc.manager/nbproject/project.xml --- a/websvc.manager/nbproject/project.xml +++ b/websvc.manager/nbproject/project.xml @@ -91,6 +91,15 @@ + org.netbeans.libs.jaxb + + + + 1 + 1.3 + + + org.netbeans.modules.editor @@ -161,15 +170,6 @@ - org.netbeans.libs.jaxb - - - - 1 - 1.3 - - - org.netbeans.modules.websvc.jaxws21 @@ -197,6 +197,15 @@ + org.netbeans.modules.websvc.jaxwsmodelapi + + + + 1 + 1.0 + + + org.netbeans.modules.websvc.saas.api @@ -205,6 +214,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.netbeans.modules.xml.retriever @@ -309,15 +327,6 @@ 6.5 - - org.netbeans.modules.websvc.jaxwsmodelapi - - - - 1 - 1.0 - - diff --git a/websvc.metro.model/nbproject/project.xml b/websvc.metro.model/nbproject/project.xml --- a/websvc.metro.model/nbproject/project.xml +++ b/websvc.metro.model/nbproject/project.xml @@ -160,6 +160,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.netbeans.modules.xml.retriever diff --git a/websvc.saas.api/nbproject/project.xml b/websvc.saas.api/nbproject/project.xml --- a/websvc.saas.api/nbproject/project.xml +++ b/websvc.saas.api/nbproject/project.xml @@ -60,6 +60,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.netbeans.modules.xml.retriever diff --git a/websvc.saas.codegen.j2ee/nbproject/project.xml b/websvc.saas.codegen.j2ee/nbproject/project.xml --- a/websvc.saas.codegen.j2ee/nbproject/project.xml +++ b/websvc.saas.codegen.j2ee/nbproject/project.xml @@ -152,6 +152,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.netbeans.modules.xml.schema.model diff --git a/websvc.saas.codegen.java/nbproject/project.xml b/websvc.saas.codegen.java/nbproject/project.xml --- a/websvc.saas.codegen.java/nbproject/project.xml +++ b/websvc.saas.codegen.java/nbproject/project.xml @@ -137,6 +137,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.netbeans.modules.xml.wsdl.model diff --git a/websvc.saas.codegen.php/nbproject/project.xml b/websvc.saas.codegen.php/nbproject/project.xml --- a/websvc.saas.codegen.php/nbproject/project.xml +++ b/websvc.saas.codegen.php/nbproject/project.xml @@ -40,6 +40,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.openide.filesystems diff --git a/websvc.saas.codegen/nbproject/project.xml b/websvc.saas.codegen/nbproject/project.xml --- a/websvc.saas.codegen/nbproject/project.xml +++ b/websvc.saas.codegen/nbproject/project.xml @@ -104,6 +104,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.netbeans.modules.xml.retriever diff --git a/websvc.saas.services.strikeiron/nbproject/project.xml b/websvc.saas.services.strikeiron/nbproject/project.xml --- a/websvc.saas.services.strikeiron/nbproject/project.xml +++ b/websvc.saas.services.strikeiron/nbproject/project.xml @@ -41,6 +41,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.openide.actions diff --git a/websvc.saas.ui/nbproject/project.xml b/websvc.saas.ui/nbproject/project.xml --- a/websvc.saas.ui/nbproject/project.xml +++ b/websvc.saas.ui/nbproject/project.xml @@ -50,6 +50,15 @@ + org.netbeans.modules.xml.jaxb.api + + + + 1 + 1.0 + + + org.netbeans.modules.xml.wsdl.model diff --git a/xml.jaxb.api/build.xml b/xml.jaxb.api/build.xml new file mode 100644 --- /dev/null +++ b/xml.jaxb.api/build.xml @@ -0,0 +1,5 @@ + + + Builds, tests, and runs the project org.netbeans.libs.jaxb + + diff --git a/xml.jaxb.api/manifest.mf b/xml.jaxb.api/manifest.mf new file mode 100644 --- /dev/null +++ b/xml.jaxb.api/manifest.mf @@ -0,0 +1,6 @@ +Manifest-Version: 1.0 +OpenIDE-Module: org.netbeans.modules.xml.jaxb.api/1 +OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/jaxb/api/Bundle.properties +OpenIDE-Module-Specification-Version: 1.0 +OpenIDE-Module-Needs: com.sun.xml.bind +OpenIDE-Module-Hide-Classpath-Packages: javax.xml.bind.**, javax.xml.stream.** diff --git a/xml.jaxb.api/nbproject/project.properties b/xml.jaxb.api/nbproject/project.properties new file mode 100644 --- /dev/null +++ b/xml.jaxb.api/nbproject/project.properties @@ -0,0 +1,51 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this +# particular file as subject to the "Classpath" exception as provided +# by Sun in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + +is.autoload=true + +jnlp.indirect.jars=\ + modules/ext/jaxb/activation.jar,\ + modules/ext/jaxb/api/jaxb-api.jar,\ + modules/ext/jaxb/api/jsr173_api.jar + +release.../libs.jaxb/external/activation.jar=modules/ext/jaxb/activation.jar +release.../libs.jaxb/external/jaxb-api.jar=modules/ext/jaxb/api/jaxb-api.jar +release.../libs.jaxb/external/jsr173_api.jar=modules/ext/jaxb/api/jsr173_api.jar + +sigtest.gen.fail.on.error=false diff --git a/xml.jaxb.api/nbproject/project.xml b/xml.jaxb.api/nbproject/project.xml new file mode 100644 --- /dev/null +++ b/xml.jaxb.api/nbproject/project.xml @@ -0,0 +1,31 @@ + + + org.netbeans.modules.apisupport.project + + + org.netbeans.modules.xml.jaxb.api + + + javax.activation + javax.xml.bind + javax.xml.bind.annotation + javax.xml.bind.annotation.adapters + javax.xml.bind.attachment + javax.xml.bind.helpers + javax.xml.bind.util + javax.xml.stream + javax.xml.stream.events + javax.xml.stream.util + + + ext/jaxb/activation.jar + + + ext/jaxb/api/jaxb-api.jar + + + ext/jaxb/api/jsr173_api.jar + + + + diff --git a/xml.jaxb.api/src/org/netbeans/modules/xml/jaxb/api/Bundle.properties b/xml.jaxb.api/src/org/netbeans/modules/xml/jaxb/api/Bundle.properties new file mode 100644 --- /dev/null +++ b/xml.jaxb.api/src/org/netbeans/modules/xml/jaxb/api/Bundle.properties @@ -0,0 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this +# particular file as subject to the "Classpath" exception as provided +# by Sun in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. +# Sample ResourceBundle properties file + +OpenIDE-Module-Name=JAXB 2.1 API + # HG changeset patch # User phejl@netbeans.org # Date 1244034799 -7200 # Node ID 986a89bb099ef36625f38070be90f19f162aaaf8 # Parent 9b58c2aa81064db5471550e89b30f2fd760fa98a Introducing Profile in j2eeserver. Refactoring to new API. diff --git a/j2ee.clientproject/nbproject/project.properties b/j2ee.clientproject/nbproject/project.properties --- a/j2ee.clientproject/nbproject/project.properties +++ b/j2ee.clientproject/nbproject/project.properties @@ -38,7 +38,7 @@ # made subject to such option by the copyright holder. javac.compilerargs=-Xlint:unchecked -spec.version.base=1.10.0 +spec.version.base=1.11.0 javadoc.arch=${basedir}/arch.xml javadoc.preview=true javac.source=1.5 diff --git a/j2ee.clientproject/nbproject/project.xml b/j2ee.clientproject/nbproject/project.xml --- a/j2ee.clientproject/nbproject/project.xml +++ b/j2ee.clientproject/nbproject/project.xml @@ -135,7 +135,7 @@ 1 - 1.36 + 1.38 @@ -179,7 +179,7 @@ 4 - 1.42 + 1.58 diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientInjectionTargetQueryImplementation.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientInjectionTargetQueryImplementation.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientInjectionTargetQueryImplementation.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientInjectionTargetQueryImplementation.java @@ -45,6 +45,7 @@ import org.netbeans.api.java.source.CompilationController; import org.netbeans.api.java.source.SourceUtils; import org.netbeans.modules.j2ee.api.ejbjar.Car; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation; /** @@ -60,8 +61,8 @@ public boolean isInjectionTarget(CompilationController controller, TypeElement typeElement) { Car apiCar = Car.getCar(controller.getFileObject()); if (apiCar != null && - !apiCar.getJ2eePlatformVersion().equals("1.3") && - !apiCar.getJ2eePlatformVersion().equals("1.4")) { + !apiCar.getJ2eePlatformVersion().equals(EjbProjectConstants.J2EE_13_LEVEL) && + !apiCar.getJ2eePlatformVersion().equals(EjbProjectConstants.J2EE_14_LEVEL)) { return SourceUtils.isMainClass(typeElement.getQualifiedName().toString(), controller.getClasspathInfo()); } return false; diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProvider.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProvider.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProvider.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProvider.java @@ -61,6 +61,7 @@ import org.netbeans.api.project.SourceGroup; import org.netbeans.api.project.Sources; import org.netbeans.api.project.ui.OpenProjects; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.clientproject.ui.customizer.AppClientProjectProperties; import org.netbeans.modules.java.api.common.classpath.ClassPathProviderImpl; import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties; @@ -145,8 +146,8 @@ /** Package-private for unit test only. */ static boolean needConfigurationFolder(final String version) { - return J2EEProjectProperties.J2EE_1_3.equals(version) || - J2EEProjectProperties.J2EE_1_4.equals(version); + return EjbProjectConstants.J2EE_13_LEVEL.equals(version) || + EjbProjectConstants.J2EE_13_LEVEL.equals(version); } public File getMetaInfAsFile() { diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java @@ -55,6 +55,7 @@ import org.netbeans.api.project.ProjectManager; import org.netbeans.api.project.ant.AntArtifact; import org.netbeans.api.project.ant.AntArtifactQuery; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.api.ejbjar.EjbReference; import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer; import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceSupport; @@ -288,7 +289,7 @@ } private static boolean isDescriptorMandatory(String j2eeVersion) { - if ("1.3".equals(j2eeVersion) || "1.4".equals(j2eeVersion)) { + if (EjbProjectConstants.J2EE_13_LEVEL.equals(j2eeVersion) || EjbProjectConstants.J2EE_14_LEVEL.equals(j2eeVersion)) { return true; } return false; diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectCreateData.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectCreateData.java new file mode 100644 --- /dev/null +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectCreateData.java @@ -0,0 +1,164 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.j2ee.clientproject.api; + +import java.io.File; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; + +/** + * + * @author Petr Hejl + */ +public final class AppClientProjectCreateData { + + private File projectDir; + + private String name; + + private String mainClass; + + private Profile javaEEProfile; + + private String serverInstanceID; + + private String librariesDefinition; + + private String serverLibraryName; + + private File[] sourceFolders; + + private File[] testFolders; + + private File confFolder; + + private File libFolder; + + public AppClientProjectCreateData() { + } + + public Profile getJavaEEProfile() { + return javaEEProfile; + } + + public void setJavaEEProfile(Profile javaEEProfile) { + this.javaEEProfile = javaEEProfile; + } + + public String getLibrariesDefinition() { + return librariesDefinition; + } + + public void setLibrariesDefinition(String librariesDefinition) { + this.librariesDefinition = librariesDefinition; + } + + public String getMainClass() { + return mainClass; + } + + public void setMainClass(String mainClass) { + this.mainClass = mainClass; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public File getProjectDir() { + return projectDir; + } + + public void setProjectDir(File projectDir) { + this.projectDir = projectDir; + } + + public String getServerInstanceID() { + return serverInstanceID; + } + + public void setServerInstanceID(String serverInstanceID) { + this.serverInstanceID = serverInstanceID; + } + + public String getServerLibraryName() { + return serverLibraryName; + } + + public void setServerLibraryName(String serverLibraryName) { + this.serverLibraryName = serverLibraryName; + } + + public File getConfFolder() { + return confFolder; + } + + public void setConfFolder(File confFolder) { + this.confFolder = confFolder; + } + + public File getLibFolder() { + return libFolder; + } + + public void setLibFolder(File libFolder) { + this.libFolder = libFolder; + } + + public File[] getSourceFolders() { + return sourceFolders; + } + + public void setSourceFolders(File[] sourceFolders) { + this.sourceFolders = sourceFolders; + } + + public File[] getTestFolders() { + return testFolders; + } + + public void setTestFolders(File[] testFolders) { + this.testFolders = testFolders; + } + +} diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java @@ -68,6 +68,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.java.api.common.ant.UpdateHelper; import org.netbeans.modules.java.api.common.project.ProjectProperties; import org.netbeans.modules.java.api.common.ui.PlatformUiSupport; @@ -123,34 +124,53 @@ * @return the helper object permitting it to be further customized * @throws IOException in case something went wrong */ + @Deprecated public static AntProjectHelper createProject(File dir, final String name, final String mainClass, final String j2eeLevel, final String serverInstanceID) throws IOException { return createProject(dir, name, mainClass, j2eeLevel, serverInstanceID, null, null); } - + + @Deprecated public static AntProjectHelper createProject(File dir, final String name, final String mainClass, final String j2eeLevel, final String serverInstanceID, final String librariesDefinition, final String serverLibraryName) throws IOException { - + + AppClientProjectCreateData createData = new AppClientProjectCreateData(); + createData.setProjectDir(dir); + createData.setName(name); + createData.setMainClass(mainClass); + createData.setJavaEEProfile(Profile.fromPropertiesString(j2eeLevel)); + createData.setServerInstanceID(serverInstanceID); + createData.setLibrariesDefinition(librariesDefinition); + createData.setServerLibraryName(serverLibraryName); + return createProject(createData); + } + + public static AntProjectHelper createProject(final AppClientProjectCreateData createData) throws IOException { + File dir = createData.getProjectDir(); + final AntProjectHelper[] h = new AntProjectHelper[1]; final FileObject projectDir = FileUtil.createFolder(dir); - + // create project in one FS atomic action: FileSystem fs = projectDir.getFileSystem(); fs.runAtomicAction(new FileSystem.AtomicAction() { public void run() throws IOException { - AntProjectHelper helper = createProjectImpl(projectDir, name, - mainClass, j2eeLevel, serverInstanceID, librariesDefinition, serverLibraryName); + AntProjectHelper helper = createProjectImpl(createData, projectDir); h[0] = helper; }}); return h[0]; } - - private static AntProjectHelper createProjectImpl(FileObject projectDir, - String name, String mainClass, String j2eeLevel, final String serverInstanceID, - final String librariesDefinition, final String serverLibraryName) throws IOException { + + private static AntProjectHelper createProjectImpl(final AppClientProjectCreateData createData, + final FileObject projectDir) throws IOException { + + String name = createData.getName(); + String mainClass = createData.getMainClass(); + String serverInstanceID = createData.getServerInstanceID(); + Profile j2eeProfile = createData.getJavaEEProfile(); FileObject srcRoot = projectDir.createFolder(DEFAULT_SRC_FOLDER); FileObject javaRoot = srcRoot.createFolder(DEFAULT_JAVA_FOLDER); @@ -159,9 +179,9 @@ // create application-client.xml String resource; - if (J2eeModule.JAVA_EE_5.equals(j2eeLevel)) { + if (Profile.JAVA_EE_5.equals(j2eeProfile)) { resource = "org-netbeans-modules-j2ee-clientproject/application-client-5.xml"; // NOI18N - } else if (J2eeModule.J2EE_14.equals(j2eeLevel)) { + } else if (Profile.J2EE_14.equals(j2eeProfile)) { resource = "org-netbeans-modules-j2ee-clientproject/application-client-1.4.xml"; // NOI18N } else { resource = "org-netbeans-modules-j2ee-clientproject/application-client-1.3.xml"; // NOI18N @@ -171,13 +191,13 @@ appClient.setDisplayName(name); appClient.write(ddFile); - final String realServerLibraryName = configureServerLibrary(librariesDefinition, - serverInstanceID, projectDir, serverLibraryName != null); + final String realServerLibraryName = configureServerLibrary(createData.getLibrariesDefinition(), + serverInstanceID, projectDir, createData.getServerLibraryName() != null); final AntProjectHelper h = setupProject(projectDir, name, DEFAULT_SRC_FOLDER, DEFAULT_TEST_FOLDER, - null, null, null, mainClass, j2eeLevel, - serverInstanceID, librariesDefinition, realServerLibraryName); + null, null, null, mainClass, j2eeProfile, + serverInstanceID, createData.getLibrariesDefinition(), realServerLibraryName); EditableProperties ep = h.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); ep.put(AppClientProjectProperties.SOURCE_ROOT, DEFAULT_SRC_FOLDER); //NOI18N @@ -193,7 +213,7 @@ try { ProjectManager.mutex().writeAccess(new Mutex.ExceptionAction() { public Void run() throws Exception { - copyRequiredLibraries(h, refHelper, serverInstanceID, serverLibraryName); + copyRequiredLibraries(h, refHelper, createData); return null; } }); @@ -225,6 +245,7 @@ * @return the helper object permitting it to be further customized * @throws IOException in case something went wrong */ + @Deprecated public static AntProjectHelper importProject(final File dir, final String name, final File[] sourceFolders, final File[] testFolders, final File confFolder, final File libFolder, final String j2eeLevel, final String serverInstanceID) throws IOException { @@ -232,36 +253,59 @@ return importProject(dir, name, sourceFolders, testFolders, confFolder, libFolder, j2eeLevel, serverInstanceID, null, null); } - + + @Deprecated public static AntProjectHelper importProject(final File dir, final String name, final File[] sourceFolders, final File[] testFolders, final File confFolder, final File libFolder, final String j2eeLevel, final String serverInstanceID, final String librariesDefinition, final String serverLibraryName) throws IOException { + + AppClientProjectCreateData createData = new AppClientProjectCreateData(); + createData.setProjectDir(dir); + createData.setName(name); + createData.setSourceFolders(sourceFolders); + createData.setTestFolders(testFolders); + createData.setConfFolder(confFolder); + createData.setLibFolder(libFolder); + createData.setJavaEEProfile(Profile.fromPropertiesString(j2eeLevel)); + createData.setServerInstanceID(serverInstanceID); + createData.setLibrariesDefinition(librariesDefinition); + createData.setServerLibraryName(serverLibraryName); + return importProject(createData); + } + + public static AntProjectHelper importProject(final AppClientProjectCreateData createData) throws IOException { + File dir = createData.getProjectDir(); + final AntProjectHelper[] h = new AntProjectHelper[1]; final FileObject projectDir = FileUtil.createFolder(dir); - + // create project in one FS atomic action: FileSystem fs = projectDir.getFileSystem(); fs.runAtomicAction(new FileSystem.AtomicAction() { public void run() throws IOException { - AntProjectHelper helper = importProjectImpl(projectDir, name, sourceFolders, - testFolders, confFolder, libFolder, j2eeLevel, serverInstanceID, librariesDefinition, serverLibraryName); + AntProjectHelper helper = importProjectImpl(createData, projectDir); h[0] = helper; }}); return h[0]; } - private static AntProjectHelper importProjectImpl(final FileObject projectDir, final String name, - final File[] sourceFolders, final File[] testFolders, final File confFolder, - final File libFolder, String j2eeLevel, final String serverInstanceID, String librariesDefinition, final String serverLibraryName) throws IOException { + private static AntProjectHelper importProjectImpl(final AppClientProjectCreateData createData, final FileObject projectDir) throws IOException { + final File[] sourceFolders = createData.getSourceFolders(); + final File[] testFolders = createData.getTestFolders(); + String name = createData.getName(); + String serverInstanceID = createData.getServerInstanceID(); + File confFolder = createData.getConfFolder(); + Profile j2eeProfile = createData.getJavaEEProfile(); + assert sourceFolders != null && testFolders != null: "Package roots can't be null"; //NOI18N - final String realServerLibraryName = configureServerLibrary(librariesDefinition, - serverInstanceID, projectDir, serverLibraryName != null); + final String realServerLibraryName = configureServerLibrary(createData.getLibrariesDefinition(), + serverInstanceID, projectDir, createData.getServerLibraryName() != null); final AntProjectHelper h = setupProject(projectDir, name, null, null, - confFolder, (libFolder == null ? null : libFolder), - null, null, j2eeLevel, serverInstanceID, librariesDefinition, realServerLibraryName); + confFolder, createData.getLibFolder(), + null, null, j2eeProfile, serverInstanceID, createData.getLibrariesDefinition(), realServerLibraryName); final AppClientProject p = (AppClientProject) ProjectManager.getDefault().findProject(projectDir); final ReferenceHelper refHelper = p.getReferenceHelper(); @@ -308,7 +352,7 @@ } } h.putPrimaryConfigurationData(data,true); - copyRequiredLibraries(h, refHelper, serverInstanceID, serverLibraryName); + copyRequiredLibraries(h, refHelper, createData); ProjectManager.getDefault().saveProject(p); return null; } @@ -328,7 +372,7 @@ //AppClient root = DDProvider.getDefault().getDDRoot(Car.getCar(appClientXML)); AppClient root = DDProvider.getDefault().getDDRoot(appClientXML); boolean writeDD = false; - if (new BigDecimal(AppClient.VERSION_1_3).equals(root.getVersion()) && J2eeModule.J2EE_14.equals(j2eeLevel)) { // NOI18N + if (new BigDecimal(AppClient.VERSION_1_3).equals(root.getVersion()) && Profile.J2EE_14.equals(j2eeProfile)) { // NOI18N root.setVersion(new BigDecimal(AppClient.VERSION_1_4)); writeDD = true; } @@ -347,9 +391,9 @@ } else { // XXX just temporary, since now the import would fail due to another bug String resource; - if (J2eeModule.JAVA_EE_5.equals(j2eeLevel)) { + if (Profile.JAVA_EE_5.equals(j2eeProfile)) { resource = "org-netbeans-modules-j2ee-clientproject/application-client-5.xml"; // NOI18N - } else if (J2eeModule.J2EE_14.equals(j2eeLevel)) { + } else if (Profile.J2EE_14.equals(j2eeProfile)) { resource = "org-netbeans-modules-j2ee-clientproject/application-client-1.4.xml"; // NOI18N } else { resource = "org-netbeans-modules-j2ee-clientproject/application-client-1.3.xml"; // NOI18N @@ -362,7 +406,7 @@ } private static void copyRequiredLibraries(AntProjectHelper h, ReferenceHelper rh, - String serverInstanceId, String serverlibraryName) throws IOException { + AppClientProjectCreateData createData) throws IOException { if (!h.isSharableProject()) { return; @@ -427,7 +471,7 @@ private static AntProjectHelper setupProject(FileObject dirFO, String name, String srcRoot, String testRoot, File configFiles, File libraries, - String resources, String mainClass, String j2eeLevel, + String resources, String mainClass, Profile j2eeProfile, String serverInstanceID, String librariesDefinition, String serverLibraryName) throws IOException { Utils.logUI(NbBundle.getBundle(AppClientProjectGenerator.class), "UI_APP_PROJECT_CREATE_SHARABILITY", // NOI18N @@ -573,14 +617,14 @@ Deployment deployment = Deployment.getDefault(); J2eePlatform j2eePlatform = Deployment.getDefault().getJ2eePlatform(serverInstanceID); - if (!j2eePlatform.getSupportedSpecVersions(J2eeModule.CLIENT).contains(j2eeLevel)) { + if (!j2eePlatform.getSupportedProfiles(J2eeModule.CLIENT).contains(j2eeProfile)) { Logger.getLogger("global").log(Level.WARNING, NbBundle.getMessage(AppClientProjectGenerator.class, "MSG_Warning_SpecLevelNotSupported", - new Object[] {j2eeLevel, Deployment.getDefault().getServerInstanceDisplayName(serverInstanceID)})); + new Object[] {j2eeProfile, Deployment.getDefault().getServerInstanceDisplayName(serverInstanceID)})); } ep.setProperty(AppClientProjectProperties.J2EE_SERVER_TYPE, deployment.getServerID(serverInstanceID)); - ep.setProperty(AppClientProjectProperties.J2EE_PLATFORM, j2eeLevel); + ep.setProperty(AppClientProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); ep.setProperty("manifest.file", "${" +AppClientProjectProperties.META_INF + "}/" + MANIFEST_FILE); // NOI18N if (h.isSharableProject() && serverLibraryName != null) { diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java @@ -70,6 +70,7 @@ import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties; import org.netbeans.modules.j2ee.common.ui.BrokenServerSupport; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; import org.netbeans.modules.java.api.common.SourceRoots; @@ -474,15 +475,15 @@ } public void actionPerformed(ActionEvent e) { - String j2eeSpec = project.evaluator().getProperty(AppClientProjectProperties.J2EE_PLATFORM); - if (j2eeSpec == null) { - j2eeSpec = J2EEProjectProperties.JAVA_EE_5; // NOI18N + Profile j2eeProfile = Profile.fromPropertiesString(project.evaluator().getProperty(AppClientProjectProperties.J2EE_PLATFORM)); + if (j2eeProfile == null) { + j2eeProfile = Profile.JAVA_EE_5; Logger.getLogger(AppClientLogicalViewProvider.class.getName()).warning( "project ["+project.getProjectDirectory()+"] is missing "+AppClientProjectProperties.J2EE_PLATFORM+". " + // NOI18N - "default value will be used instead: "+j2eeSpec); // NOI18N - updateJ2EESpec(project, project.getAntProjectHelper(), j2eeSpec); + "default value will be used instead: "+j2eeProfile); // NOI18N + updateJ2EESpec(project, project.getAntProjectHelper(), j2eeProfile); } - String instance = BrokenServerSupport.selectServer(j2eeSpec, J2eeModule.CLIENT); + String instance = BrokenServerSupport.selectServer(j2eeProfile, J2eeModule.CLIENT); if (instance != null) { AppClientProjectProperties.setServerInstance( project, helper.getAntProjectHelper(), instance); @@ -490,12 +491,12 @@ checkMissingServer(); } - private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final String j2eeSpec) { + private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final Profile j2eeProfile) { ProjectManager.mutex().postWriteRequest(new Runnable() { public void run() { try { EditableProperties projectProps = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); - projectProps.put(AppClientProjectProperties.J2EE_PLATFORM, j2eeSpec); + projectProps.put(AppClientProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); helper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, projectProps); ProjectManager.getDefault().saveProject(project); } catch (IOException e) { diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientCompositePanelProvider.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientCompositePanelProvider.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientCompositePanelProvider.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientCompositePanelProvider.java @@ -45,6 +45,7 @@ import java.util.ResourceBundle; import javax.swing.JComponent; import javax.swing.JPanel; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.clientproject.AppClientProject; import org.netbeans.modules.j2ee.clientproject.wsclient.CustomizerWSClientHost; import org.netbeans.modules.j2ee.clientproject.wsclient.NoWebServiceClientsPanel; @@ -125,7 +126,7 @@ if (clientSupport != null) { serviceClientsSettings = clientSupport.getServiceClients(); } - if(J2EEProjectProperties.J2EE_1_4.equals( + if(EjbProjectConstants.J2EE_14_LEVEL.equals( project.getCarModule().getJ2eePlatformVersion()) && serviceClientsSettings != null && serviceClientsSettings.size() > 0) { ProjectCustomizer.Category clients = ProjectCustomizer.Category.create(WEBSERVICECLIENTS, diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java @@ -85,6 +85,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.java.api.common.SourceRoots; import org.netbeans.modules.java.api.common.ant.UpdateHelper; import org.netbeans.modules.java.api.common.project.ProjectProperties; @@ -334,8 +335,8 @@ PLATFORM_MODEL = PlatformUiSupport.createPlatformComboBoxModel (evaluator.getProperty(JAVA_PLATFORM)); PLATFORM_LIST_RENDERER = PlatformUiSupport.createPlatformListCellRenderer(); SpecificationVersion minimalSourceLevel = null; - if (J2EEProjectProperties.JAVA_EE_5.equals(evaluator.getProperty(J2EE_PLATFORM))) { - minimalSourceLevel = new SpecificationVersion(J2EEProjectProperties.JAVA_EE_5); + if (Profile.JAVA_EE_5.equals(Profile.fromPropertiesString(evaluator.getProperty(J2EE_PLATFORM)))) { + minimalSourceLevel = new SpecificationVersion("1.5"); } JAVAC_SOURCE_MODEL = PlatformUiSupport.createSourceLevelComboBoxModel(PLATFORM_MODEL, evaluator.getProperty(JAVAC_SOURCE), evaluator.getProperty(JAVAC_TARGET), minimalSourceLevel); JAVAC_SOURCE_RENDERER = PlatformUiSupport.createSourceLevelListCellRenderer (); diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle.properties b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle.properties --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle.properties +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle.properties @@ -67,10 +67,6 @@ LBL_IW_CreatedFile_LabelMnemonic=F ACS_LBL_IW_CreatedFile_A11YDesc=Location of the created buildfile -#ImportLocationVisual -J2EESpecLevel_15=Java EE 5 -J2EESpecLevel_14=J2EE 1.4 -J2EESpecLevel_13=J2EE 1.3 ACS_NWP1_NamePanel_A11YDesc=Project Name and Location Panel #LBL_IW_ImportTitle=Name and Location TXT_ImportAppClientModule=Enterprise Application Client with Existing Sources diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/ImportAppClientProjectWizardIterator.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/ImportAppClientProjectWizardIterator.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/ImportAppClientProjectWizardIterator.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/ImportAppClientProjectWizardIterator.java @@ -54,6 +54,7 @@ import org.netbeans.modules.j2ee.api.ejbjar.Ear; import org.netbeans.modules.j2ee.clientproject.AppClientProject; import org.netbeans.modules.j2ee.clientproject.Utils; +import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectCreateData; import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectGenerator; import org.netbeans.modules.j2ee.common.project.ui.UserProjectSettings; import org.netbeans.modules.j2ee.common.SharabilityUtility; @@ -61,6 +62,7 @@ import org.netbeans.modules.j2ee.common.project.ui.ProjectLocationWizardPanel; import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.ui.support.ProjectChooser; import org.openide.WizardDescriptor; @@ -113,22 +115,21 @@ if (dirF != null) { dirF = FileUtil.normalizeFile(dirF); } - String name = (String) wiz.getProperty(ProjectLocationWizardPanel.NAME); -// File dirSrcF = (File) wiz.getProperty (WizardProperties.SOURCE_ROOT); - File[] sourceFolders = (File[]) wiz.getProperty(WizardProperties.JAVA_ROOT); - File[] testFolders = (File[]) wiz.getProperty(WizardProperties.TEST_ROOT); - File configFilesFolder = (File) wiz.getProperty(WizardProperties.CONFIG_FILES_FOLDER); - File libName = (File) wiz.getProperty(WizardProperties.LIB_FOLDER); - String serverInstanceID = (String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID); - String j2eeLevel = (String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); - - String librariesDefinition = - SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES)); - String serverLibraryName = (String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY); - - AntProjectHelper h = AppClientProjectGenerator.importProject(dirF, name, - sourceFolders, testFolders, configFilesFolder, libName, j2eeLevel, - serverInstanceID, librariesDefinition, serverLibraryName); + + AppClientProjectCreateData createData = new AppClientProjectCreateData(); + createData.setProjectDir(dirF); + createData.setName((String) wiz.getProperty(ProjectLocationWizardPanel.NAME)); + createData.setSourceFolders((File[]) wiz.getProperty(WizardProperties.JAVA_ROOT)); + createData.setTestFolders((File[]) wiz.getProperty(WizardProperties.TEST_ROOT)); + createData.setConfFolder((File) wiz.getProperty(WizardProperties.CONFIG_FILES_FOLDER)); + createData.setLibFolder((File) wiz.getProperty(WizardProperties.LIB_FOLDER)); + createData.setServerInstanceID((String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID)); + createData.setJavaEEProfile((Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL)); + createData.setLibrariesDefinition( + SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES))); + createData.setServerLibraryName((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY)); + + AntProjectHelper h = AppClientProjectGenerator.importProject(createData); handle.progress(2); @@ -151,7 +152,7 @@ } // remember last used server - UserProjectSettings.getDefault().setLastUsedServer(serverInstanceID); + UserProjectSettings.getDefault().setLastUsedServer(createData.getServerInstanceID()); // downgrade the Java platform or src level to 1.4 String platformName = (String)wiz.getProperty(ProjectServerWizardPanel.JAVA_PLATFORM); diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/NewAppClientProjectWizardIterator.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/NewAppClientProjectWizardIterator.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/NewAppClientProjectWizardIterator.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/NewAppClientProjectWizardIterator.java @@ -55,12 +55,14 @@ import org.netbeans.api.project.ProjectManager; import org.netbeans.modules.j2ee.api.ejbjar.Ear; import org.netbeans.modules.j2ee.clientproject.AppClientProject; +import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectCreateData; import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectGenerator; import org.netbeans.modules.j2ee.common.project.ui.UserProjectSettings; import org.netbeans.modules.j2ee.common.SharabilityUtility; import org.netbeans.modules.j2ee.common.project.ui.ProjectLocationWizardPanel; import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.spi.java.project.support.ui.SharableLibrariesUtils; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.ui.support.ProjectChooser; @@ -116,18 +118,19 @@ if (dirF != null) { dirF = FileUtil.normalizeFile(dirF); } - String name = (String)wiz.getProperty(ProjectLocationWizardPanel.NAME); + String mainClass = (String)wiz.getProperty(ProjectServerWizardPanel.MAIN_CLASS); + AppClientProjectCreateData createData = new AppClientProjectCreateData(); + createData.setProjectDir(dirF); + createData.setName((String)wiz.getProperty(ProjectLocationWizardPanel.NAME)); + createData.setMainClass(mainClass); + createData.setServerInstanceID((String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID)); + createData.setJavaEEProfile((Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL)); + createData.setLibrariesDefinition( + SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES))); + createData.setServerLibraryName((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY)); - String serverInstanceID = (String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID); - String j2eeLevel = (String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); - - String librariesDefinition = - SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES)); - String serverLibraryName = (String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY); - - AntProjectHelper h = AppClientProjectGenerator.createProject(dirF, name, - mainClass, j2eeLevel, serverInstanceID, librariesDefinition, serverLibraryName); + AntProjectHelper h = AppClientProjectGenerator.createProject(createData); handle.progress(2); @@ -155,8 +158,8 @@ } // remember last used server - UserProjectSettings.getDefault().setLastUsedServer(serverInstanceID); - SharableLibrariesUtils.setLastProjectSharable(librariesDefinition != null); + UserProjectSettings.getDefault().setLastUsedServer(createData.getServerInstanceID()); + SharableLibrariesUtils.setLastProjectSharable(createData.getLibrariesDefinition() != null); // downgrade the Java platform or src level to 1.4 String platformName = (String)wiz.getProperty(ProjectServerWizardPanel.JAVA_PLATFORM); diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectWebServicesClientSupport.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectWebServicesClientSupport.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectWebServicesClientSupport.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectWebServicesClientSupport.java @@ -61,6 +61,7 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; import org.netbeans.api.project.ui.OpenProjects; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.clientproject.AppClientProject; import org.netbeans.modules.j2ee.clientproject.AppClientProjectType; import org.netbeans.modules.j2ee.clientproject.AppClientProvider; @@ -504,7 +505,7 @@ public List getStubDescriptors() { ArrayList stubs = new ArrayList(2); String version = project.getCarModule().getJ2eePlatformVersion(); - if(J2eeModule.J2EE_14.equals(version)) { + if (EjbProjectConstants.J2EE_14_LEVEL.equals(version)) { stubs.add(jsr109ClientStub); } stubs.add(jaxrpcClientStub); diff --git a/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientProviderTest.java b/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientProviderTest.java --- a/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientProviderTest.java +++ b/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientProviderTest.java @@ -45,6 +45,7 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; import org.netbeans.junit.NbTestCase; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.clientproject.test.TestUtil; import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties; import org.netbeans.modules.j2ee.dd.api.client.AppClientMetadata; @@ -124,11 +125,11 @@ public void testNeedConfigurationFolder() { assertTrue("1.3 needs configuration folder", - AppClientProvider.needConfigurationFolder(J2EEProjectProperties.J2EE_1_3)); + AppClientProvider.needConfigurationFolder(EjbProjectConstants.J2EE_13_LEVEL)); assertTrue("1.4 needs configuration folder", - AppClientProvider.needConfigurationFolder(J2EEProjectProperties.J2EE_1_4)); + AppClientProvider.needConfigurationFolder(EjbProjectConstants.J2EE_14_LEVEL)); assertFalse("5.0 does not need configuration folder", - AppClientProvider.needConfigurationFolder(J2EEProjectProperties.JAVA_EE_5)); + AppClientProvider.needConfigurationFolder(EjbProjectConstants.JAVA_EE_5_LEVEL)); assertFalse("Anything else does not need configuration folder", AppClientProvider.needConfigurationFolder("5.0")); assertFalse("Anything else does not need configuration folder", diff --git a/j2ee.common/manifest.mf b/j2ee.common/manifest.mf --- a/j2ee.common/manifest.mf +++ b/j2ee.common/manifest.mf @@ -2,5 +2,5 @@ OpenIDE-Module: org.netbeans.modules.j2ee.common/1 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/common/Bundle.properties OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker -OpenIDE-Module-Specification-Version: 1.37 +OpenIDE-Module-Specification-Version: 1.38 AutoUpdate-Show-In-Client: false diff --git a/j2ee.common/nbproject/project.xml b/j2ee.common/nbproject/project.xml --- a/j2ee.common/nbproject/project.xml +++ b/j2ee.common/nbproject/project.xml @@ -158,7 +158,7 @@ 4 - 1.23 + 1.58 diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/Util.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/Util.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/Util.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/Util.java @@ -382,6 +382,7 @@ * is not known specification version constant * * @since 1.18 + * @deprecated */ public static String getJ2eeSpecificationLabel(String specificationVersion) { Parameters.notNull("specificationVersion", specificationVersion); // NOI18N diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/Bundle.properties b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/Bundle.properties --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/Bundle.properties +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/Bundle.properties @@ -47,11 +47,6 @@ #Sharable visual panel PanelSharabilityVisual.label=Sharability -#J2eePlatformUiSupport -JAVA_EE_5_displayName=Java EE 5 -J2EE_1_4_displayName=J2EE 1.4 -J2EE_1_3_displayName=J2EE 1.3 - #Sharable panel PanelSharability.licenseWarning.text=There may be legal considerations when sharing server JAR files. Be sure to check the license for your server to make sure you can distribute server JAR files to other developers. PanelSharability.relativePathWarning.text=Please make sure the relative path to library definitions is always accessible in the same way. @@ -110,9 +105,6 @@ LBL_PanelOptions_SharableProject_Checkbox=Project Shared With Other Users LBL_PanelOptions_Location_Label=Sharable Libraries Location: LBL_Browse_Libraries_AcceptedFiles=*.properties files -JavaEESpecLevel_50=Java EE 5 -J2EESpecLevel_14=J2EE 1.4 -J2EESpecLevel_13=J2EE 1.3 ACS_LBL_NWP1_SetAsMain_A11YDesc=Set as Main Project ACS_LBL_NPW1_J2EESpecLevel_A11YDesc=Java EE Version Combo Box ACS_LBL_NWP1_ContextPath_A11YDesc=Context Path diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2EEProjectProperties.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2EEProjectProperties.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2EEProjectProperties.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2EEProjectProperties.java @@ -52,10 +52,6 @@ */ public final class J2EEProjectProperties { - public static final String JAVA_EE_5 = "1.5"; // NOI18N - public static final String J2EE_1_4 = "1.4"; // NOI18N - public static final String J2EE_1_3 = "1.3"; // NOI18N - public static final String J2EE_PLATFORM_CLASSPATH = "j2ee.platform.classpath"; //NOI18N /** diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eePlatformUiSupport.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eePlatformUiSupport.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eePlatformUiSupport.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eePlatformUiSupport.java @@ -51,6 +51,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.openide.util.NbBundle; /** @@ -58,37 +59,53 @@ * @author Andrei Badea, Radko Najman */ public class J2eePlatformUiSupport { - - private static final String JAVA_EE_5_DISPLAY_NAME = NbBundle.getMessage(J2eePlatformUiSupport.class, "JAVA_EE_5_displayName"); // NOI18N - private static final String J2EE_1_4_DISPLAY_NAME = NbBundle.getMessage(J2eePlatformUiSupport.class, "J2EE_1_4_displayName"); // NOI18N - private static final String J2EE_1_3_DISPLAY_NAME = NbBundle.getMessage(J2eePlatformUiSupport.class, "J2EE_1_3_displayName"); // NOI18N private J2eePlatformUiSupport() { } - + + @Deprecated public static ComboBoxModel createPlatformComboBoxModel(String serverInstanceId, String j2eeLevel, Object moduleType) { - return new J2eePlatformComboBoxModel(serverInstanceId, j2eeLevel, moduleType); + return new J2eePlatformComboBoxModel(serverInstanceId, Profile.fromPropertiesString(j2eeLevel), moduleType); } - + + public static ComboBoxModel createPlatformComboBoxModel(String serverInstanceId, Profile j2eeProfile, Object moduleType) { + return new J2eePlatformComboBoxModel(serverInstanceId, j2eeProfile, moduleType); + } + + @Deprecated public static ComboBoxModel createSpecVersionComboBoxModel(String j2eeSpecVersion) { - return new J2eeSpecVersionComboBoxModel(j2eeSpecVersion); + return new J2eeSpecVersionComboBoxModel(Profile.fromPropertiesString(j2eeSpecVersion)); } - + + public static ComboBoxModel createSpecVersionComboBoxModel(Profile profile) { + return new J2eeSpecVersionComboBoxModel(profile); + } + public static boolean getJ2eePlatformAndSpecVersionMatch(Object j2eePlatformModelObject, Object j2eeSpecVersionModelObject, Object moduleType) { - if (!(j2eePlatformModelObject instanceof J2eePlatformAdapter && j2eeSpecVersionModelObject instanceof String)) { + if (!(j2eePlatformModelObject instanceof J2eePlatformAdapter + && (j2eeSpecVersionModelObject instanceof String || j2eeSpecVersionModelObject instanceof Profile))) { return false; } - + J2eePlatform j2eePlatform = ((J2eePlatformAdapter)j2eePlatformModelObject).getJ2eePlatform(); - String specVersion = (String)j2eeSpecVersionModelObject; - return j2eePlatform.getSupportedSpecVersions(moduleType).contains(specVersion); + Profile profile = null; + if (j2eeSpecVersionModelObject instanceof Profile) { + profile = (Profile) j2eeSpecVersionModelObject; + } else { + profile = Profile.fromPropertiesString((String) j2eeSpecVersionModelObject); + } + return j2eePlatform.getSupportedProfiles(moduleType).contains(profile); } - + + @Deprecated public static String getSpecVersion(Object j2eeSpecVersionModelObject) { - return ((J2eePlatformComboBoxItem)j2eeSpecVersionModelObject).getCode(); + return ((J2eePlatformComboBoxItem)j2eeSpecVersionModelObject).getProfile().toPropertiesString(); } - + + public static Profile getJavaEEProfile(Object j2eeSpecVersionModelObject) { + return ((J2eePlatformComboBoxItem) j2eeSpecVersionModelObject).getProfile(); + } public static String getServerInstanceID(Object j2eePlatformModelObject) { if (j2eePlatformModelObject == null) @@ -120,12 +137,12 @@ private J2eePlatformAdapter[] j2eePlatforms; private final String initialJ2eePlatform; private J2eePlatformAdapter selectedJ2eePlatform; - private final String j2eeLevel; + private final Profile j2eeProfile; private final Object moduleType; - public J2eePlatformComboBoxModel(String serverInstanceID, String j2eeLevel, Object moduleType) { + public J2eePlatformComboBoxModel(String serverInstanceID, Profile j2eeProfile, Object moduleType) { initialJ2eePlatform = serverInstanceID; - this.j2eeLevel = j2eeLevel; + this.j2eeProfile = j2eeProfile; this.moduleType = moduleType; getJ2eePlatforms(moduleType); @@ -166,7 +183,7 @@ J2eePlatform j2eePlatform = Deployment.getDefault().getJ2eePlatform(serverInstanceIDs[i]); if (j2eePlatform != null) { if (j2eePlatform.getSupportedModuleTypes().contains(moduleType) - && j2eePlatform.getSupportedSpecVersions(moduleType).contains(j2eeLevel)) { + && j2eePlatform.getSupportedProfiles(moduleType).contains(j2eeProfile)) { J2eePlatformAdapter adapter = new J2eePlatformAdapter(j2eePlatform, serverInstanceIDs[i]); orderedNames.add(adapter); @@ -224,15 +241,15 @@ private J2eePlatformComboBoxItem initialJ2eeSpecVersion; private J2eePlatformComboBoxItem selectedJ2eeSpecVersion; - public J2eeSpecVersionComboBoxModel(String j2eeSpecVersion) { - initialJ2eeSpecVersion = new J2eePlatformComboBoxItem(j2eeSpecVersion); + public J2eeSpecVersionComboBoxModel(Profile j2eeProfile) { + initialJ2eeSpecVersion = new J2eePlatformComboBoxItem(j2eeProfile); List orderedListItems = new ArrayList(); - orderedListItems.add(new J2eePlatformComboBoxItem(J2EEProjectProperties.JAVA_EE_5)); - orderedListItems.add(new J2eePlatformComboBoxItem(J2EEProjectProperties.J2EE_1_4)); - if (!J2EEProjectProperties.JAVA_EE_5.equals(initialJ2eeSpecVersion.getCode()) && - !J2EEProjectProperties.J2EE_1_4.equals(initialJ2eeSpecVersion.getCode())) { - orderedListItems.add(0, new J2eePlatformComboBoxItem(J2EEProjectProperties.J2EE_1_3)); + orderedListItems.add(new J2eePlatformComboBoxItem(Profile.JAVA_EE_5)); + orderedListItems.add(new J2eePlatformComboBoxItem(Profile.J2EE_14)); + if (!(Profile.JAVA_EE_5 == initialJ2eeSpecVersion.getProfile()) && + !(Profile.J2EE_14 == initialJ2eeSpecVersion.getProfile())) { + orderedListItems.add(0, new J2eePlatformComboBoxItem(Profile.J2EE_13)); } j2eeSpecVersions = orderedListItems.toArray(new J2eePlatformComboBoxItem[orderedListItems.size()]); @@ -257,41 +274,19 @@ } private static final class J2eePlatformComboBoxItem{ - private String code; - private String displayName; + private final Profile profile; - public J2eePlatformComboBoxItem (String code, String displayName){ - this.code = code; - this.displayName = displayName; + public J2eePlatformComboBoxItem (Profile profile){ + this.profile = profile; } - public J2eePlatformComboBoxItem (String code){ - this(code, findDisplayName(code)); - } - - private static String findDisplayName(String code){ - if (code == null) { - return ""; - } - if(code.equals(J2EEProjectProperties.JAVA_EE_5)) { - return JAVA_EE_5_DISPLAY_NAME; - } - if(code.equals(J2EEProjectProperties.J2EE_1_4)) { - return J2EE_1_4_DISPLAY_NAME; - } - if(code.equals(J2EEProjectProperties.J2EE_1_3)) { - return J2EE_1_3_DISPLAY_NAME; - } - return code; //version display name not found, use the version code for display name - } - - public String getCode(){ - return code; + public Profile getProfile() { + return profile; } @Override public String toString(){ - return displayName; + return profile.getDisplayName(); } } diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eeVersionWarningPanel.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eeVersionWarningPanel.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eeVersionWarningPanel.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eeVersionWarningPanel.java @@ -46,6 +46,7 @@ import org.netbeans.api.java.platform.Specification; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.common.project.ui.UserProjectSettings; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.openide.modules.SpecificationVersion; /** @@ -134,26 +135,26 @@ } return javaPlatformName; } - - public static String findWarningType(String j2eeLevel) { + + public static String findWarningType(Profile j2eeProfile) { // System.out.println("findWarningType: j2eeLevel="+j2eeLevel); JavaPlatform defaultPlatform = JavaPlatformManager.getDefault().getDefaultPlatform(); SpecificationVersion version = defaultPlatform.getSpecification().getVersion(); String sourceLevel = version.toString(); // #89131: these levels are not actually distinct from 1.5. if (sourceLevel.equals("1.6") || sourceLevel.equals("1.7")) - sourceLevel = "1.5"; + sourceLevel = "1.5"; // System.out.println("default platform is "+version); - + // no warning if 1.4 is the default for j2ee14 - if (new SpecificationVersion("1.4").equals(version) && j2eeLevel.equals(J2eeModule.J2EE_14)) // NOI18N + if (new SpecificationVersion("1.4").equals(version) && j2eeProfile == Profile.J2EE_14) // NOI18N return null; - + // no warning if 1.5, 1.6, 1.7 is the default for j2ee15 - if ("1.5".equals(sourceLevel) && j2eeLevel.equals(J2eeModule.JAVA_EE_5)) // NOI18N + if ("1.5".equals(sourceLevel) && j2eeProfile == Profile.JAVA_EE_5) // NOI18N return null; - - if (j2eeLevel.equals(J2eeModule.J2EE_14)) { + + if (j2eeProfile == Profile.J2EE_14) { JavaPlatform[] java14Platforms = getJavaPlatforms("1.4"); //NOI18N if (java14Platforms.length > 0) { // the user has JDK 1.4, so we warn we'll downgrade to 1.4 @@ -162,7 +163,7 @@ // no JDK 1.4, the best we can do is downgrade the source level to 1.4 return WARN_SET_SOURCE_LEVEL_14; } - } else if (j2eeLevel.equals(J2eeModule.JAVA_EE_5)) { + } else if (j2eeProfile == Profile.JAVA_EE_5) { JavaPlatform[] java15Platforms = getJavaPlatforms("1.5"); //NOI18N if (java15Platforms.length > 0) { // the user has JDK 1.4, so we warn we'll downgrade to 1.4 @@ -176,6 +177,11 @@ return null; } } + + @Deprecated + public static String findWarningType(String j2eeLevel) { + return findWarningType(Profile.fromPropertiesString(j2eeLevel)); + } private static JavaPlatform[] getJavaPlatforms(String level) { return JavaPlatformManager.getDefault().getPlatforms(null, new Specification("J2SE", new SpecificationVersion(level))); // NOI18N diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.form b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.form --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.form +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.form @@ -12,6 +12,7 @@ + @@ -32,20 +33,20 @@ - + - + - + - + @@ -56,7 +57,7 @@ - + @@ -76,11 +77,11 @@ - + - + diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.java @@ -65,6 +65,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.ServerManager; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeApplicationProvider; import org.netbeans.modules.j2ee.common.project.ui.UserProjectSettings; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.spi.project.support.ant.PropertyUtils; import org.openide.WizardDescriptor; import org.openide.filesystems.FileObject; @@ -82,10 +83,6 @@ private J2eeVersionWarningPanel warningPanel; private boolean sharableProject; - - private static final String J2EE_SPEC_13_LABEL = NbBundle.getMessage(ProjectServerPanel.class, "J2EESpecLevel_13"); //NOI18N - private static final String J2EE_SPEC_14_LABEL = NbBundle.getMessage(ProjectServerPanel.class, "J2EESpecLevel_14"); //NOI18N - private static final String JAVA_EE_SPEC_50_LABEL = NbBundle.getMessage(ProjectServerPanel.class, "JavaEESpecLevel_50"); //NOI18N private List earProjects; private Object j2eeModuleType; @@ -385,18 +382,18 @@ if (serverInstanceWrapper != null) { selectedServerInstanceID = serverInstanceWrapper.getServerInstanceID(); } - String lastSelectedJ2eeSpecLevel = (String) j2eeSpecComboBox.getSelectedItem(); + ProfileItem lastSelectedJ2eeProfile = (ProfileItem) j2eeSpecComboBox.getSelectedItem(); String newServerInstanceID = ServerManager.showAddServerInstanceWizard(); if (newServerInstanceID != null) { selectedServerInstanceID = newServerInstanceID; // clear the spec level selection - lastSelectedJ2eeSpecLevel = null; + lastSelectedJ2eeProfile = null; j2eeSpecComboBox.setSelectedItem(null); } // refresh the list of servers initServers(selectedServerInstanceID); - if (lastSelectedJ2eeSpecLevel != null) { - j2eeSpecComboBox.setSelectedItem(lastSelectedJ2eeSpecLevel); + if (lastSelectedJ2eeProfile != null) { + j2eeSpecComboBox.setSelectedItem(lastSelectedJ2eeProfile); } }//GEN-LAST:event_addServerButtonActionPerformed @@ -405,27 +402,20 @@ }//GEN-LAST:event_j2eeSpecComboBoxActionPerformed private void serverInstanceComboBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_serverInstanceComboBoxActionPerformed - String prevSelectedItem = (String) j2eeSpecComboBox.getSelectedItem(); + ProfileItem prevSelectedItem = (ProfileItem) j2eeSpecComboBox.getSelectedItem(); // update the j2ee spec list according to the selected server ServerInstanceWrapper serverInstanceWrapper = (ServerInstanceWrapper) serversModel.getSelectedItem(); + j2eeSpecComboBox.removeAllItems(); if (serverInstanceWrapper != null) { J2eePlatform j2eePlatform = Deployment.getDefault().getJ2eePlatform(serverInstanceWrapper.getServerInstanceID()); - Set supportedVersions = j2eePlatform.getSupportedSpecVersions(j2eeModuleType); - j2eeSpecComboBox.removeAllItems(); - if (supportedVersions.contains(J2eeModule.JAVA_EE_5)) { - j2eeSpecComboBox.addItem(JAVA_EE_SPEC_50_LABEL); - } - if (supportedVersions.contains(J2eeModule.J2EE_14)) { - j2eeSpecComboBox.addItem(J2EE_SPEC_14_LABEL); - } - if (supportedVersions.contains(J2eeModule.J2EE_13)) { - j2eeSpecComboBox.addItem(J2EE_SPEC_13_LABEL); + Set profiles = new TreeSet(Profile.REVERSE_COMPARATOR); + profiles.addAll(j2eePlatform.getSupportedProfiles(j2eeModuleType)); + for (Profile profile : profiles) { + j2eeSpecComboBox.addItem(new ProfileItem(profile)); } if (prevSelectedItem != null) { j2eeSpecComboBox.setSelectedItem(prevSelectedItem); } - } else { - j2eeSpecComboBox.removeAllItems(); } // revalidate the form wizard.fireChangeEvent(); @@ -548,7 +538,7 @@ void store(WizardDescriptor d) { d.putProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID, getSelectedServer()); - d.putProperty(ProjectServerWizardPanel.J2EE_LEVEL, getSelectedJ2eeSpec()); + d.putProperty(ProjectServerWizardPanel.J2EE_LEVEL, getSelectedJ2eeProfile()); d.putProperty(ProjectServerWizardPanel.CONTEXT_PATH, jTextFieldContextPath.getText().trim()); d.putProperty(ProjectServerWizardPanel.EAR_APPLICATION, getSelectedEarApplication()); d.putProperty(ProjectServerWizardPanel.WAR_NAME, jTextFieldWebAppName.getText()); @@ -564,7 +554,7 @@ if (warningPanel != null && warningPanel.getDowngradeAllowed()) { d.putProperty(ProjectServerWizardPanel.JAVA_PLATFORM, warningPanel.getSuggestedJavaPlatformName()); - String j2ee = getSelectedJ2eeSpec(); + Profile j2ee = getSelectedJ2eeProfile(); if (j2ee != null) { String warningType = J2eeVersionWarningPanel.findWarningType(j2ee); UserProjectSettings fls = UserProjectSettings.getDefault(); @@ -701,11 +691,9 @@ } } - private String getSelectedJ2eeSpec() { - Object item = j2eeSpecComboBox.getSelectedItem(); - return item == null ? null - : item.equals(JAVA_EE_SPEC_50_LABEL) ? J2eeModule.JAVA_EE_5 : - ( item.equals(J2EE_SPEC_14_LABEL) ? J2eeModule.J2EE_14 : J2eeModule.J2EE_13); + private Profile getSelectedJ2eeProfile() { + ProfileItem item = (ProfileItem) j2eeSpecComboBox.getSelectedItem(); + return item == null ? null : item.getProfile(); } private String getSelectedServer() { @@ -749,7 +737,7 @@ } private void setJ2eeVersionWarningPanel() { - String j2ee = getSelectedJ2eeSpec(); + Profile j2ee = getSelectedJ2eeProfile(); if (j2ee == null) { warningPlaceHolderPanel.setVisible(false); return; @@ -810,7 +798,7 @@ } } else { // suppose highest - j2eeSpecComboBox.setSelectedItem(JAVA_EE_SPEC_50_LABEL); + j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.JAVA_EE_5)); } } } @@ -835,9 +823,9 @@ } if(new BigDecimal(org.netbeans.modules.j2ee.dd.api.ejb.EjbJar.VERSION_2_0).equals(version)) { - j2eeSpecComboBox.setSelectedItem(J2EE_SPEC_13_LABEL); + j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.J2EE_13)); } else if(new BigDecimal(org.netbeans.modules.j2ee.dd.api.ejb.EjbJar.VERSION_2_1).equals(version)) { - j2eeSpecComboBox.setSelectedItem(J2EE_SPEC_14_LABEL); + j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.J2EE_14)); } } catch (IOException e) { String message = NbBundle.getMessage(ProjectServerPanel.class, "MSG_EjbJarXmlCorrupted"); // NOI18N @@ -862,11 +850,11 @@ } if (new BigDecimal(org.netbeans.modules.j2ee.dd.api.client.AppClient.VERSION_1_3).equals(version)) { - j2eeSpecComboBox.setSelectedItem(J2EE_SPEC_13_LABEL); + j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.J2EE_13)); } else if(new BigDecimal(org.netbeans.modules.j2ee.dd.api.client.AppClient.VERSION_1_4).equals(version)) { - j2eeSpecComboBox.setSelectedItem(J2EE_SPEC_14_LABEL); + j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.J2EE_14)); } else if(new BigDecimal(org.netbeans.modules.j2ee.dd.api.client.AppClient.VERSION_5_0).equals(version)) { - j2eeSpecComboBox.setSelectedItem(JAVA_EE_SPEC_50_LABEL); + j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.JAVA_EE_5)); } } catch (IOException e) { String message = NbBundle.getMessage(ProjectServerPanel.class, "MSG_AppClientXmlCorrupted"); // NOI18N @@ -876,9 +864,10 @@ private void setJ2eeVersionWarning(WizardDescriptor d) { String errorMessage; - String selectedItem = (String)j2eeSpecComboBox.getSelectedItem(); + ProfileItem selectedItem = (ProfileItem) j2eeSpecComboBox.getSelectedItem(); - if (J2EE_SPEC_14_LABEL.equals(selectedItem) && new BigDecimal(org.netbeans.modules.j2ee.dd.api.ejb.EjbJar.VERSION_2_0).equals(xmlVersion)) { + if ((Profile.J2EE_14 == selectedItem.getProfile()) + && new BigDecimal(org.netbeans.modules.j2ee.dd.api.ejb.EjbJar.VERSION_2_0).equals(xmlVersion)) { errorMessage = NbBundle.getMessage(ProjectServerPanel.class, "MSG_EjbJarXMLNotSupported"); } else { errorMessage = null; @@ -937,4 +926,45 @@ public HelpCtx getHelpCtx() { return new HelpCtx(ProjectImportLocationPanel.generateHelpID(ProjectServerPanel.class, j2eeModuleType)); } + + private static class ProfileItem { + + private final Profile profile; + + public ProfileItem(Profile profile) { + this.profile = profile; + } + + public Profile getProfile() { + return profile; + } + + @Override + public String toString() { + return profile.getDisplayName(); + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final ProfileItem other = (ProfileItem) obj; + if (this.profile != other.profile && (this.profile == null || !this.profile.equals(other.profile))) { + return false; + } + return true; + } + + @Override + public int hashCode() { + int hash = 7; + hash = 97 * hash + (this.profile != null ? this.profile.hashCode() : 0); + return hash; + } + + } } diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerSupport.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerSupport.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerSupport.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerSupport.java @@ -44,10 +44,10 @@ import java.awt.Dialog; import javax.swing.JButton; import javax.swing.SwingUtilities; -import org.netbeans.modules.j2ee.common.*; import org.netbeans.modules.j2ee.common.ui.NoSelectedServerWarning; import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.openide.DialogDescriptor; import org.openide.DialogDisplayer; import org.openide.util.NbBundle; @@ -91,6 +91,7 @@ * @param j2eeSpec one of {@link J2eeModule#EJB}, {@link J2eeModule#EAR} * @param moduleType * @return selected application server. Might be null. + * @deprecated */ public static String selectServer(final String j2eeSpec, final Object moduleType) { return NoSelectedServerWarning.selectServerDialog( @@ -99,6 +100,13 @@ NbBundle.getMessage(BrokenServerSupport.class, "ACSD_Resolve_Missing_Server")); // NOI18N } + public static String selectServer(final Profile j2eeProfile, final Object moduleType) { + return NoSelectedServerWarning.selectServerDialog( + new Object[] { moduleType }, j2eeProfile, + NbBundle.getMessage(BrokenServerSupport.class, "LBL_Resolve_Missing_Server_Title"), + NbBundle.getMessage(BrokenServerSupport.class, "ACSD_Resolve_Missing_Server")); // NOI18N + } + /** * Show alert message box informing user that a project has missing * server. This method can be safely called from any thread, e.g. during diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.form b/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.form --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.form +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.form @@ -1,12 +1,14 @@ - + + + @@ -105,7 +107,7 @@ - + diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.java @@ -53,8 +53,8 @@ import javax.swing.ListSelectionModel; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.api.ServerManager; import org.openide.DialogDescriptor; import org.openide.DialogDisplayer; @@ -65,17 +65,17 @@ * * @author Pavel Buzek */ -public final class NoSelectedServerWarning extends JPanel { +final class NoSelectedServerWarning extends JPanel { public static final String OK_ENABLED = "ok_enabled"; //NOI18N - private final String j2eeSpec; + private final Profile j2eeProfile; - private NoSelectedServerWarning(Object[] moduleTypes, String j2eeSpec) { - this.j2eeSpec = j2eeSpec; + private NoSelectedServerWarning(Object[] moduleTypes, Profile j2eeProfile) { + this.j2eeProfile = j2eeProfile; initComponents(); - serverList.setModel(new ServerListModel(moduleTypes, j2eeSpec)); + serverList.setModel(new ServerListModel(moduleTypes, j2eeProfile)); if (serverList.getModel().getSize() > 0) { jTextArea2.setVisible(false); } @@ -105,9 +105,14 @@ * * @return serverInstanceId of the selected server instance, null * if canceled. + * @deprecated */ public static String selectServerDialog(Object[] moduleTypes, String j2eeSpec, String title, String description) { - NoSelectedServerWarning panel = new NoSelectedServerWarning(moduleTypes, j2eeSpec); + return selectServerDialog(moduleTypes, Profile.fromPropertiesString(j2eeSpec), title, description); + } + + public static String selectServerDialog(Object[] moduleTypes, Profile j2eeProfile, String title, String description) { + NoSelectedServerWarning panel = new NoSelectedServerWarning(moduleTypes, j2eeProfile); Object[] options = new Object[] { DialogDescriptor.OK_OPTION, DialogDescriptor.CANCEL_OPTION @@ -161,7 +166,7 @@ * WARNING: Do NOT modify this code. The content of this method is * always regenerated by the Form Editor. */ - // //GEN-BEGIN:initComponents + // //GEN-BEGIN:initComponents private void initComponents() { java.awt.GridBagConstraints gridBagConstraints; @@ -239,7 +244,7 @@ jButtonAddServer.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(NoSelectedServerWarning.class, "ACSN_AddServer")); // NOI18N jButtonAddServer.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(NoSelectedServerWarning.class, "ACSD_AddServer")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(listLabel, org.openide.util.NbBundle.getMessage(NoSelectedServerWarning.class, "LBL_NoSelectedServerWarning_listLabel", new Object[] {Util.getJ2eeSpecificationLabel(j2eeSpec)})); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(listLabel, org.openide.util.NbBundle.getMessage(NoSelectedServerWarning.class, "LBL_NoSelectedServerWarning_listLabel", new Object[] {j2eeProfile.getDisplayName()})); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 2; @@ -286,12 +291,12 @@ private String[] instances; private final Object[] moduleTypes; - private final String j2eeSpec; + private final Profile j2eeProfile; - public ServerListModel(Object[] moduleTypes, String j2eeSpec) { + public ServerListModel(Object[] moduleTypes, Profile j2eeProfile) { this.moduleTypes = moduleTypes; - this.j2eeSpec = j2eeSpec; - instances = Deployment.getDefault().getServerInstanceIDs(moduleTypes, j2eeSpec); + this.j2eeProfile = j2eeProfile; + instances = Deployment.getDefault().getServerInstanceIDs(moduleTypes, j2eeProfile); } public synchronized int getSize() { @@ -308,7 +313,7 @@ public synchronized void refreshModel() { int oldLength = instances.length; - instances = Deployment.getDefault().getServerInstanceIDs(moduleTypes, j2eeSpec); + instances = Deployment.getDefault().getServerInstanceIDs(moduleTypes, j2eeProfile); if (instances.length > 0) { fireContentsChanged(this, 0, instances.length - 1); } else if (oldLength > 0) { diff --git a/j2ee.earproject/nbproject/project.xml b/j2ee.earproject/nbproject/project.xml --- a/j2ee.earproject/nbproject/project.xml +++ b/j2ee.earproject/nbproject/project.xml @@ -135,7 +135,7 @@ 1 - 1.36 + 1.38 @@ -152,7 +152,7 @@ - 1.1 + 1.16 @@ -170,7 +170,7 @@ 4 - 1.54 + 1.58 diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProject.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProject.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProject.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProject.java @@ -67,6 +67,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; import org.netbeans.modules.j2ee.earproject.classpath.ClassPathProviderImpl; import org.netbeans.modules.j2ee.earproject.classpath.ClassPathSupportCallbackImpl; @@ -640,8 +641,13 @@ return helper.getStandardPropertyEvaluator().getProperty(EarProjectProperties.J2EE_SERVER_INSTANCE); } + @Deprecated public String getJ2eePlatformVersion() { - return helper.getStandardPropertyEvaluator().getProperty(EarProjectProperties.J2EE_PLATFORM); + return helper.getStandardPropertyEvaluator().getProperty(EarProjectProperties.J2EE_PLATFORM); + } + + public Profile getJ2eeProfile() { + return Profile.fromPropertiesString(helper.getStandardPropertyEvaluator().getProperty(EarProjectProperties.J2EE_PLATFORM)); } public GeneratedFilesHelper getGeneratedFilesHelper() { diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectGenerator.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectGenerator.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectGenerator.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectGenerator.java @@ -58,6 +58,7 @@ import org.netbeans.api.project.ProjectUtils; import org.netbeans.api.project.ant.AntArtifact; import org.netbeans.api.project.ant.AntArtifactQuery; +import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectCreateData; import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectGenerator; import org.netbeans.modules.j2ee.common.SharabilityUtility; import org.netbeans.modules.java.api.common.classpath.ClassPathSupport; @@ -69,8 +70,10 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.ui.customizer.EarProjectProperties; import org.netbeans.modules.j2ee.earproject.util.EarProjectUtil; +import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectCreateData; import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectGenerator; import org.netbeans.modules.web.project.api.WebProjectCreateData; import org.netbeans.modules.web.project.api.WebProjectUtilities; @@ -109,19 +112,19 @@ private final File prjDir; private final String name; - private final String j2eeLevel; + private final Profile j2eeProfile; private final String serverInstanceID; private final String sourceLevel; private final FileObject prjDirFO; private String librariesDefinition; private String serverLibraryName; - private EarProjectGenerator(File prjDir, FileObject prjDirFO, String name, String j2eeLevel, + private EarProjectGenerator(File prjDir, FileObject prjDirFO, String name, Profile j2eeProfile, String serverInstanceID, String sourceLevel, String librariesDefinition, String serverLibraryName) { this.prjDir = prjDir; this.prjDirFO = prjDirFO; this.name = name; - this.j2eeLevel = j2eeLevel; + this.j2eeProfile = j2eeProfile; this.serverInstanceID = serverInstanceID; // #89131: these levels are not actually distinct from 1.5. if (sourceLevel != null && (sourceLevel.equals("1.6") || sourceLevel.equals("1.7"))) @@ -139,10 +142,10 @@ * @return the helper object permitting it to be further customized * @throws IOException in case something went wrong */ - public static AntProjectHelper createProject(File prjDir, String name, String j2eeLevel, + public static AntProjectHelper createProject(File prjDir, String name, Profile j2eeProfile, String serverInstanceId, String sourceLevel, String librariesDefinition, String serverLibraryName) throws IOException { FileObject projectDir = FileUtil.createFolder(prjDir); - final EarProjectGenerator earGen = new EarProjectGenerator(prjDir, projectDir, name, j2eeLevel, + final EarProjectGenerator earGen = new EarProjectGenerator(prjDir, projectDir, name, j2eeProfile, serverInstanceId, sourceLevel, librariesDefinition, serverLibraryName); final AntProjectHelper[] h = new AntProjectHelper[1]; @@ -157,13 +160,13 @@ } public static AntProjectHelper importProject(File pDir, final File sDir, String name, - String j2eeLevel, String serverInstanceID, final String platformName, + Profile j2eeProfile, String serverInstanceID, final String platformName, String sourceLevel, final Map userModules, String librariesDefinition, String serverLibraryName) throws IOException { FileObject projectDir = FileUtil.createFolder(pDir); final EarProjectGenerator earGen = new EarProjectGenerator(pDir, projectDir, name, - j2eeLevel, serverInstanceID, sourceLevel, librariesDefinition, serverLibraryName); + j2eeProfile, serverInstanceID, sourceLevel, librariesDefinition, serverLibraryName); final AntProjectHelper[] h = new AntProjectHelper[1]; // create project in one FS atomic action: @@ -204,7 +207,7 @@ } EarProject earProject = p.getLookup().lookup(EarProject.class); assert earProject != null; - setupDD(j2eeLevel, docBase, earProject); + setupDD(j2eeProfile, docBase, earProject); return h; } @@ -292,7 +295,7 @@ } } - setupDD(j2eeLevel, docBase, earProject); + setupDD(j2eeProfile, docBase, earProject); if (userModules == null || userModules.isEmpty()) { userModules = ModuleType.detectModules(srcPrjDirFO); @@ -414,11 +417,17 @@ private AntProjectHelper addAppClientModule(final FileObject javaRoot, final FileObject subprojectRoot, final File subProjDir, final String platformName) throws IOException { FileObject docBaseFO = FileUtil.createFolder(subprojectRoot, DEFAULT_DOC_BASE_FOLDER); File docBase = FileUtil.toFile(docBaseFO); - AntProjectHelper subProjHelper = AppClientProjectGenerator.importProject( - subProjDir, subprojectRoot.getName(), - new File[] { FileUtil.toFile(javaRoot) }, - new File[0], docBase, - null, checkJ2eeVersion(j2eeLevel, serverInstanceID, J2eeModule.CLIENT), serverInstanceID); + + AppClientProjectCreateData createData = new AppClientProjectCreateData(); + createData.setProjectDir(subProjDir); + createData.setName(subprojectRoot.getName()); + createData.setSourceFolders(new File[] { FileUtil.toFile(javaRoot) }); + createData.setTestFolders(new File[0]); + createData.setConfFolder(docBase); + createData.setJavaEEProfile(getAcceptableProfile(j2eeProfile, serverInstanceID, J2eeModule.CLIENT)); + createData.setServerInstanceID(serverInstanceID); + + AntProjectHelper subProjHelper = AppClientProjectGenerator.importProject(createData); if (platformName != null || sourceLevel != null) { AppClientProjectGenerator.setPlatform(subProjHelper, platformName, sourceLevel); } @@ -428,11 +437,17 @@ private AntProjectHelper addEJBModule(final FileObject javaRoot, final FileObject subprojectRoot, final File subProjDir, final String platformName) throws IOException { FileObject docBaseFO = FileUtil.createFolder(subprojectRoot, DEFAULT_DOC_BASE_FOLDER); File docBase = FileUtil.toFile(docBaseFO); - AntProjectHelper subProjHelper = EjbJarProjectGenerator.importProject( - subProjDir, subprojectRoot.getName(), - new File[] {FileUtil.toFile(javaRoot)}, - new File[0], docBase, - null, checkJ2eeVersion(j2eeLevel, serverInstanceID, J2eeModule.EJB), serverInstanceID); + + EjbJarProjectCreateData createData = new EjbJarProjectCreateData(); + createData.setProjectDir(subProjDir); + createData.setName(subprojectRoot.getName()); + createData.setSourceFolders(new File[] {FileUtil.toFile(javaRoot)}); + createData.setTestFolders(new File[0]); + createData.setConfigFilesBase(docBase); + createData.setJavaEEProfile(getAcceptableProfile(j2eeProfile, serverInstanceID, J2eeModule.EJB)); + createData.setServerInstanceID(serverInstanceID); + + AntProjectHelper subProjHelper = EjbJarProjectGenerator.importProject(createData); if (platformName != null || sourceLevel != null) { EjbJarProjectGenerator.setPlatform(subProjHelper, platformName, sourceLevel); } @@ -448,7 +463,7 @@ createData.setTestFolders(new File[0]); createData.setDocBase(FileUtil.createFolder(subprojectRoot, "web")); //NOI18N createData.setLibFolder(null); - createData.setJavaEEVersion(checkJ2eeVersion(j2eeLevel, serverInstanceID, J2eeModule.WAR)); + createData.setJavaEEProfile(getAcceptableProfile(j2eeProfile, serverInstanceID, J2eeModule.WAR)); createData.setServerInstanceID(serverInstanceID); createData.setBuildfile("build.xml"); //NOI18N createData.setJavaPlatformName(platformName); @@ -458,17 +473,22 @@ return WebProjectUtilities.importProject(createData); } - static FileObject setupDD(final String j2eeLevel, final FileObject docBase, + static FileObject setupDD(final Profile j2eeProfile, final FileObject docBase, final EarProject earProject) throws IOException { - return setupDD(j2eeLevel, docBase, earProject, false); + return setupDD(j2eeProfile, docBase, earProject, false); } + @Deprecated + public static FileObject setupDD(final String j2eeLevel, final FileObject docBase, + final Project earProject, boolean force) throws IOException { + return setupDD(Profile.fromPropertiesString(j2eeLevel), docBase, earProject, force); + } /** * Generate deployment descriptor (application.xml) if needed or forced (applies for JAVA EE 5). *

* For J2EE 1.4 or older the deployment descriptor is always generated if missing. * For JAVA EE 5 it is only generated if missing and forced as well. - * @param j2eeLevel J2EE level, see {@link J2eeModule J2eeModule constants}. + * @param j2eeprofile J2EE profile. * @param docBase Configuration directory. * @param earProject EAR project instance. * @param force if true application.xml is generated even if it's not needed @@ -476,7 +496,7 @@ * @return {@link FileObject} of the deployment descriptor or null. * @throws java.io.IOException if any error occurs. */ - public static FileObject setupDD(final String j2eeLevel, final FileObject docBase, + public static FileObject setupDD(final Profile j2eeProfile, final FileObject docBase, final Project earProject, boolean force) throws IOException { FileObject dd = docBase.getFileObject(ProjectEar.FILE_DD); if (dd != null) { @@ -486,7 +506,7 @@ if (EarProjectUtil.isDDCompulsory(earProject)) { template = FileUtil.getConfigFile( "org-netbeans-modules-j2ee-earproject/ear-1.4.xml"); // NOI18N - } else if (J2eeModule.JAVA_EE_5.equals(j2eeLevel)) { + } else if (Profile.JAVA_EE_5.equals(j2eeProfile)) { if (force) { template = FileUtil.getConfigFile( "org-netbeans-modules-j2ee-earproject/ear-5.xml"); // NOI18N @@ -504,7 +524,7 @@ "If it\'s *really* needed, set force param to true." + newLine); } } else { - assert false : "Unknown j2eeLevel: " + j2eeLevel; + assert false : "Unknown j2eeProfile: " + j2eeProfile; } if (template != null) { dd = FileUtil.copyFile(template, docBase, "application"); // NOI18N @@ -528,13 +548,13 @@ * For now the only check is to use J2EE 1.4 if JavaEE5 is not supported. * Otherwise use the requestedVersion. */ - public static String checkJ2eeVersion(String requestedVersion, String serverInstanceID, Object moduleType) { + public static Profile getAcceptableProfile(Profile requestedProfile, String serverInstanceID, Object moduleType) { J2eePlatform platform = Deployment.getDefault().getJ2eePlatform(serverInstanceID); - Set versions = platform.getSupportedSpecVersions(moduleType); - if (!versions.contains(requestedVersion) && (versions.contains(J2eeModule.J2EE_14))) { - return J2eeModule.J2EE_14; + Set profiles = platform.getSupportedProfiles(moduleType); + if (!profiles.contains(requestedProfile) && (profiles.contains(Profile.J2EE_14))) { + return Profile.J2EE_14; } - return requestedVersion; + return requestedProfile; } private static String relativePath(FileObject parent, FileObject child) { @@ -575,7 +595,7 @@ ep.setProperty(EarProjectProperties.DIST_DIR, "dist"); // NOI18N ep.setProperty(EarProjectProperties.DIST_JAR, "${" + EarProjectProperties.DIST_DIR + "}/${" + EarProjectProperties.JAR_NAME + "}"); // NOI18N - ep.setProperty(EarProjectProperties.J2EE_PLATFORM, j2eeLevel); + ep.setProperty(EarProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); ep.setProperty(EarProjectProperties.JAR_NAME, name + ".ear"); // NOI18N ep.setProperty(EarProjectProperties.JAR_COMPRESS, "false"); // NOI18N diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ProjectEar.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ProjectEar.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ProjectEar.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ProjectEar.java @@ -74,6 +74,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeApplication; import org.netbeans.modules.j2ee.deployment.devmodules.api.ModuleChangeReporter; import org.netbeans.modules.j2ee.deployment.devmodules.api.ModuleListener; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.spi.ArtifactListener; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeApplicationProvider; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeApplicationImplementation; @@ -262,7 +263,7 @@ private Application getDDFromFile() throws IOException { FileObject dd = getDeploymentDescriptor(); if (dd == null) { - dd = EarProjectGenerator.setupDD(project.getJ2eePlatformVersion(), getMetaInf(), project); + dd = EarProjectGenerator.setupDD(project.getJ2eeProfile(), getMetaInf(), project); } return DDProvider.getDefault().getDDRoot(dd); } @@ -348,8 +349,13 @@ return new String[] {}; } + // FIXME mix of two apis public String getJ2eePlatformVersion () { - return project.getJ2eePlatformVersion(); // helper.getStandardPropertyEvaluator ().getProperty (EarProjectProperties.J2EE_PLATFORM); + return project.getJ2eePlatformVersion(); + } + + public Profile getJ2eeProfile() { + return project.getJ2eeProfile(); } @Override diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationMetadataModelImpl.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationMetadataModelImpl.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationMetadataModelImpl.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationMetadataModelImpl.java @@ -133,7 +133,7 @@ && EarProjectUtil.isDDCompulsory(earProject)) { try { ddFO = EarProjectGenerator.setupDD( - earProject.getJ2eePlatformVersion(), + earProject.getJ2eeProfile(), earProject.getAppModule().getMetaInf(), earProject, true); diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java @@ -70,6 +70,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; import org.netbeans.modules.j2ee.earproject.EarProject; @@ -482,16 +483,16 @@ } public void actionPerformed(ActionEvent e) { - String j2eeSpec = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH). - getProperty(EarProjectProperties.J2EE_PLATFORM); - if (j2eeSpec == null) { - j2eeSpec = J2EEProjectProperties.JAVA_EE_5; // NOI18N + Profile j2eeProfile = Profile.fromPropertiesString(helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH). + getProperty(EarProjectProperties.J2EE_PLATFORM)); + if (j2eeProfile == null) { + j2eeProfile = Profile.JAVA_EE_5; Logger.getLogger(J2eeArchiveLogicalViewProvider.class.getName()).warning( "project ["+project.getProjectDirectory()+"] is missing "+EarProjectProperties.J2EE_PLATFORM+". " + // NOI18N - "default value will be used instead: "+j2eeSpec); // NOI18N - updateJ2EESpec(project, project.getAntProjectHelper(), j2eeSpec); + "default value will be used instead: "+j2eeProfile); // NOI18N + updateJ2EESpec(project, project.getAntProjectHelper(), j2eeProfile); } - String instance = BrokenServerSupport.selectServer(j2eeSpec, J2eeModule.EAR); + String instance = BrokenServerSupport.selectServer(j2eeProfile, J2eeModule.EAR); if (instance != null) { EarProjectProperties.setServerInstance( project, helper, instance); @@ -499,12 +500,12 @@ checkMissingServer(); } - private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final String j2eeSpec) { + private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final Profile j2eeProfile) { ProjectManager.mutex().postWriteRequest(new Runnable() { public void run() { try { EditableProperties projectProps = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); - projectProps.put(EarProjectProperties.J2EE_PLATFORM, j2eeSpec); + projectProps.put(EarProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); helper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, projectProps); ProjectManager.getDefault().saveProject(project); } catch (IOException e) { diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle.properties b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle.properties --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle.properties +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle.properties @@ -171,11 +171,6 @@ MSG_AACH_RefToItself=Cannot add reference to itself. MSG_AACH_Cycles=Cannot add cyclic references. -# J2EE Specification levels -J2EESpecLevel_13=J2EE 1.3 -J2EESpecLevel_14=J2EE 1.4 -JavaEESpecLevel_50=Java EE 5 - # EarProjectProperties - modified bulid-impl.xml TXT_Regenerate=

The "build-impl.xml" file was modified externally.


\

The IDE automatically generates this file whenever you edit project
\ diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.form b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.form --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.form +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.form @@ -27,11 +27,8 @@ - - - - - + + @@ -40,7 +37,7 @@ - + @@ -87,7 +84,7 @@ - + @@ -147,7 +144,7 @@ - + @@ -238,10 +235,7 @@ - - - - + diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.java @@ -59,6 +59,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.api.ServerInstance; import org.netbeans.modules.j2ee.earproject.EarProject; import org.netbeans.spi.project.support.ant.AntProjectHelper; @@ -124,11 +125,9 @@ clientModuleUriCombo.setModel(uiProperties.CLIENT_MODULE_MODEL); jCheckBoxDeployOnSave.setModel(uiProperties.DEPLOY_ON_SAVE_MODEL); - String j2eeVersion = uiProperties.getProject().getJ2eePlatformVersion(); - if (J2eeModule.JAVA_EE_5.equals(j2eeVersion)) { - jTextFieldVersion.setText(EarProjectProperties.JAVA_EE_SPEC_50_LABEL); - } else if (J2eeModule.J2EE_14.equals(j2eeVersion)) { - jTextFieldVersion.setText(EarProjectProperties.J2EE_SPEC_14_LABEL); + Profile j2eeProfile = uiProperties.getProject().getJ2eeProfile(); + if (j2eeProfile != null) { + jTextFieldVersion.setText(j2eeProfile.getDisplayName()); } setDeployOnSaveState(); handleWebModuleRelated(); @@ -147,9 +146,8 @@ } private int getLongestVersionLength() { - return Math.max( - EarProjectProperties.JAVA_EE_SPEC_50_LABEL.length(), - EarProjectProperties.J2EE_SPEC_14_LABEL.length()); + // FIXME fix UI to handle the case without this stuff :/ + return Profile.JAVA_EE_6_FULL.getDisplayName().length(); } /** This method is called from within the constructor to diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java @@ -123,11 +123,6 @@ */ public final class EarProjectProperties { - public static final String J2EE_SPEC_14_LABEL = - NbBundle.getMessage(EarProjectProperties.class, "J2EESpecLevel_14"); - public static final String JAVA_EE_SPEC_50_LABEL = - NbBundle.getMessage(EarProjectProperties.class, "JavaEESpecLevel_50"); - // Special properties of the project public static final String WEB_PROJECT_NAME = "web.project.name"; //NOI18N public static final String JAVA_PLATFORM = "platform.active"; //NOI18N diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIterator.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIterator.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIterator.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIterator.java @@ -58,6 +58,7 @@ import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; import org.netbeans.modules.j2ee.common.project.ui.UserProjectSettings; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.EarProjectGenerator; import org.netbeans.modules.j2ee.earproject.ModuleType; import org.openide.WizardDescriptor; @@ -120,7 +121,7 @@ srcF = FileUtil.normalizeFile(srcF); } String name = (String) wiz.getProperty(ProjectLocationWizardPanel.NAME); - String j2eeLevel = (String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); + Profile j2eeProfile = (Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); // String contextPath = (String) wiz.getProperty(WizardProperties.CONTEXT_PATH); String serverInstanceID = (String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID); String platformName = (String)wiz.getProperty(ProjectServerWizardPanel.JAVA_PLATFORM); @@ -131,18 +132,18 @@ String librariesDefinition = SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES)); String serverLibraryName = (String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY); - return testableInstantiate(platformName, sourceLevel, j2eeLevel, dirF, + return testableInstantiate(platformName, sourceLevel, j2eeProfile, dirF, srcF, serverInstanceID, name, userModules, handle, librariesDefinition, serverLibraryName); } /** Package private for unit test only. */ static Set testableInstantiate(final String platformName, - final String sourceLevel, final String j2eeLevel, final File dirF, + final String sourceLevel, final Profile j2eeProfile, final File dirF, final File srcF, final String serverInstanceID, final String name, final Map userModules, ProgressHandle handle, String librariesDefinition, String serverLibraryName) throws IOException { - EarProjectGenerator.importProject(dirF, srcF, name, j2eeLevel, + EarProjectGenerator.importProject(dirF, srcF, name, j2eeProfile, serverInstanceID, platformName, sourceLevel, userModules, librariesDefinition, serverLibraryName); if (handle != null) { diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIterator.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIterator.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIterator.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIterator.java @@ -55,6 +55,7 @@ import org.netbeans.api.progress.ProgressHandle; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; +import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectCreateData; import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectGenerator; import org.netbeans.modules.j2ee.common.SharabilityUtility; import org.netbeans.modules.j2ee.common.project.ui.ProjectLocationWizardPanel; @@ -62,11 +63,13 @@ import org.netbeans.modules.j2ee.common.project.ui.UserProjectSettings; import org.netbeans.modules.j2ee.dd.api.application.Application; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.EarProject; import org.netbeans.modules.j2ee.earproject.EarProjectGenerator; import org.netbeans.modules.j2ee.earproject.ui.customizer.CustomizerRun; import org.netbeans.modules.j2ee.earproject.ui.customizer.EarProjectProperties; import org.netbeans.modules.j2ee.earproject.util.EarProjectUtil; +import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectCreateData; import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectGenerator; import org.netbeans.modules.web.api.webmodule.WebModule; import org.netbeans.modules.web.project.api.WebProjectCreateData; @@ -128,7 +131,7 @@ } String name = (String) wiz.getProperty(ProjectLocationWizardPanel.NAME); String serverInstanceID = (String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID); - String j2eeLevel = (String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); + Profile j2eeLevel = (Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); Boolean createWAR = (Boolean) wiz.getProperty(ProjectServerWizardPanel.CREATE_WAR); String warName = null; if (createWAR.booleanValue()) { @@ -161,12 +164,12 @@ } /** Package private for unit test only. */ - static Set testableInstantiate(File dirF, String name, String j2eeLevel, + static Set testableInstantiate(File dirF, String name, Profile j2eeProfile, String serverInstanceID, String warName, String ejbJarName, String carName, String mainClass, String platformName, String sourceLevel, ProgressHandle handle, String librariesDefinition, String serverLibraryName) throws IOException { Set resultSet = new LinkedHashSet(); - AntProjectHelper h = EarProjectGenerator.createProject(dirF, name, j2eeLevel, + AntProjectHelper h = EarProjectGenerator.createProject(dirF, name, j2eeProfile, serverInstanceID, sourceLevel, librariesDefinition, serverLibraryName); if (handle != null) handle.progress(2); @@ -200,18 +203,19 @@ Project webProject = null; if (null != warName) { File webAppDir = FileUtil.normalizeFile(new File(dirF, warName)); - + WebProjectCreateData createData = new WebProjectCreateData(); createData.setProjectDir(webAppDir); createData.setName(warName); createData.setServerInstanceID(serverInstanceID); createData.setSourceStructure(WebProjectUtilities.SRC_STRUCT_BLUEPRINTS); - createData.setJavaEEVersion(EarProjectGenerator.checkJ2eeVersion(j2eeLevel, serverInstanceID, J2eeModule.WAR)); + createData.setJavaEEProfile(EarProjectGenerator.getAcceptableProfile(j2eeProfile, serverInstanceID, J2eeModule.WAR)); createData.setContextPath('/' + warName); //NOI18N createData.setJavaPlatformName(platformName); createData.setSourceLevel(sourceLevel); createData.setLibrariesDefinition(librariesDefinition); createData.setServerLibraryName(serverLibraryName); + if (handle != null) handle.progress(NbBundle.getMessage(NewEarProjectWizardIterator.class, "LBL_NewEarProjectWizardIterator_WizardProgress_WAR"), 3); AntProjectHelper webHelper = WebProjectUtilities.createProject(createData); @@ -229,12 +233,19 @@ Project appClient = null; if (null != carName) { File carDir = FileUtil.normalizeFile(new File(dirF,carName)); + + AppClientProjectCreateData createData = new AppClientProjectCreateData(); + createData.setProjectDir(carDir); + createData.setName(carName); + createData.setMainClass(mainClass); + createData.setJavaEEProfile(EarProjectGenerator.getAcceptableProfile(j2eeProfile, serverInstanceID, J2eeModule.CLIENT)); + createData.setServerInstanceID(serverInstanceID); + createData.setLibrariesDefinition(librariesDefinition); + createData.setServerLibraryName(serverLibraryName); + if (handle != null) handle.progress(NbBundle.getMessage(NewEarProjectWizardIterator.class, "LBL_NewEarProjectWizardIterator_WizardProgress_AppClient"), 5); - AntProjectHelper clientHelper = AppClientProjectGenerator.createProject( - carDir, carName, mainClass, - EarProjectGenerator.checkJ2eeVersion(j2eeLevel, serverInstanceID, - J2eeModule.CLIENT), serverInstanceID, librariesDefinition, serverLibraryName); + AntProjectHelper clientHelper = AppClientProjectGenerator.createProject(createData); if (handle != null) handle.progress(6); @@ -249,11 +260,18 @@ } if (null != ejbJarName) { File ejbJarDir = FileUtil.normalizeFile(new File(dirF,ejbJarName)); + + EjbJarProjectCreateData createData = new EjbJarProjectCreateData(); + createData.setProjectDir(ejbJarDir); + createData.setName(ejbJarName); + createData.setJavaEEProfile(EarProjectGenerator.getAcceptableProfile(j2eeProfile, serverInstanceID, J2eeModule.EJB)); + createData.setServerInstanceID(serverInstanceID); + createData.setLibrariesDefinition(librariesDefinition); + createData.setServerLibraryName(serverLibraryName); + if (handle != null) handle.progress(NbBundle.getMessage(NewEarProjectWizardIterator.class, "LBL_NewEarProjectWizardIterator_WizardProgress_EJB"), 7); - AntProjectHelper ejbHelper = EjbJarProjectGenerator.createProject(ejbJarDir,ejbJarName, - EarProjectGenerator.checkJ2eeVersion(j2eeLevel, serverInstanceID, J2eeModule.EJB), - serverInstanceID, librariesDefinition, serverLibraryName); + AntProjectHelper ejbHelper = EjbJarProjectGenerator.createProject(createData); if (handle != null) handle.progress(8); diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/dd/ApplicationXmlWizardIterator.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/dd/ApplicationXmlWizardIterator.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/dd/ApplicationXmlWizardIterator.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/dd/ApplicationXmlWizardIterator.java @@ -111,6 +111,7 @@ EarImplementation projectEar = panel.getProject().getLookup().lookup(EarImplementation.class); if (confRoot != null && projectEar != null) { try { + // FIXME mix of two API constants FileObject dd = EarProjectGenerator.setupDD(projectEar.getJ2eePlatformVersion(), projectEar.getMetaInf(), panel.getProject(), true); return Collections.singleton(dd); diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectGeneratorTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectGeneratorTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectGeneratorTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectGeneratorTest.java @@ -48,6 +48,7 @@ import org.netbeans.api.project.ProjectManager; import org.netbeans.junit.NbTestCase; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.test.TestUtil; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.support.ant.EditableProperties; @@ -153,7 +154,7 @@ public void testCreateProjectJavaEE5() throws Exception { File prjDirF = new File(getWorkDir(), "EARProject"); AntProjectHelper aph = EarProjectGenerator.createProject(prjDirF, "test-project", - J2eeModule.JAVA_EE_5, serverID, "1.5", null, null); + Profile.JAVA_EE_5, serverID, "1.5", null, null); assertNotNull(aph); FileObject prjDirFO = aph.getProjectDirectory(); for (String file : CREATED_FILES) { @@ -179,7 +180,7 @@ public void testCreateProjectJ2EE14() throws Exception { File prjDirF = new File(getWorkDir(), "EARProject"); AntProjectHelper aph = EarProjectGenerator.createProject(prjDirF, "test-project", - J2eeModule.J2EE_14, serverID, "1.4", null, null); + Profile.J2EE_14, serverID, "1.4", null, null); assertNotNull(aph); FileObject prjDirFO = aph.getProjectDirectory(); for (String file : CREATED_FILES) { @@ -199,7 +200,7 @@ public void testImportProject() throws Exception { File prjDirF = new File(getWorkDir(), "EARProject"); AntProjectHelper helper = EarProjectGenerator.importProject(prjDirF, prjDirF, - "test-project-ext-src", J2eeModule.JAVA_EE_5, serverID, null, + "test-project-ext-src", Profile.JAVA_EE_5, serverID, null, "1.5", Collections.emptyMap(), null, null); assertNotNull(helper); FileObject prjDirFO = FileUtil.toFileObject(prjDirF); @@ -225,7 +226,7 @@ public void testProjectNameIsSet() throws Exception { // #73930 File prjDirF = new File(getWorkDir(), "EARProject"); EarProjectGenerator.createProject(prjDirF, "test-project", - J2eeModule.JAVA_EE_5, serverID, "1.5", null, null); + Profile.JAVA_EE_5, serverID, "1.5", null, null); // test also build final File buildXML = new File(prjDirF, "build.xml"); String projectName = ProjectManager.mutex().readAccess(new Mutex.ExceptionAction() { @@ -242,7 +243,7 @@ public void testProjectNameIsEscaped() throws Exception { final File prjDirF = new File(getWorkDir(), "EARProject"); EarProjectGenerator.createProject(prjDirF, "test project", - J2eeModule.JAVA_EE_5, serverID, "1.5", null, null); + Profile.JAVA_EE_5, serverID, "1.5", null, null); // test build.xml String buildXmlProjectName = ProjectManager.mutex().readAccess(new Mutex.ExceptionAction() { public String run() throws Exception { diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectTest.java @@ -60,6 +60,7 @@ import org.netbeans.modules.j2ee.dd.api.application.Application; import org.netbeans.modules.j2ee.dd.api.application.DDProvider; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.test.TestUtil; import org.netbeans.modules.j2ee.earproject.ui.wizards.NewEarProjectWizardIteratorTest; import org.netbeans.modules.project.uiapi.ProjectOpenedTrampoline; @@ -94,7 +95,7 @@ public void testEarWithoutDDOpeningJavaEE() throws Exception { File prjDirF = new File(getWorkDir(), "TestEarProject_15"); EarProjectGenerator.createProject(prjDirF, "test-project", - J2eeModule.JAVA_EE_5, serverID, "1.5", null, null); + Profile.JAVA_EE_5, serverID, "1.5", null, null); File dirCopy = copyFolder(prjDirF); File ddF = new File(dirCopy, "src/conf/application.xml"); assertFalse("has no deployment descriptor", ddF.isFile()); @@ -108,7 +109,7 @@ public void testEarWithoutDDOpeningJ2EE() throws Exception { // #75586 File prjDirF = new File(getWorkDir(), "TestEarProject_14"); EarProjectGenerator.createProject(prjDirF, "test-project", - J2eeModule.J2EE_14, serverID, "1.4", null, null); + Profile.J2EE_14, serverID, "1.4", null, null); File dirCopy = copyFolder(prjDirF); File ddF = new File(dirCopy, "src/conf/application.xml"); assertTrue("has deployment descriptor", ddF.isFile()); @@ -124,10 +125,10 @@ public void testThatMissingDDIsNotRegeneratedDuringOpeningJavaEE() throws Exception { File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.JAVA_EE_5; + Profile j2eeProfile = Profile.JAVA_EE_5; String ejbName = "testEA-ejb"; String acName = "testEA-ac"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID, null, ejbName, acName, null, null, null); File dirCopy = copyFolder(earDirF); File ddF = new File(dirCopy, "src/conf/application.xml"); @@ -147,10 +148,10 @@ public void testThatMissingDDIsRegeneratedCorrectlyDuringOpeningJ2EE() throws Exception { // #81154 File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.J2EE_14; + Profile j2eeProfile = Profile.J2EE_14; String ejbName = "testEA-ejb"; String acName = "testEA-ac"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID, null, ejbName, acName, null, null, null); File dirCopy = copyFolder(earDirF); File ddF = new File(dirCopy, "src/conf/application.xml"); @@ -171,10 +172,10 @@ public void testOpeningWihtoutPrivateMetadataAndSrcDirectory() throws Exception { // #83507 File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.JAVA_EE_5; + Profile j2eeProfile = Profile.JAVA_EE_5; String ejbName = "testEA-ejb"; String acName = "testEA-ac"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID, null, ejbName, acName, null, null, null); File dirCopy = copyFolder(earDirF); TestUtil.deleteRec(new File(new File(dirCopy, "nbproject"), "private")); @@ -191,10 +192,10 @@ public void testEarProjectIsGCed() throws Exception { // #83128 File prjDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = "1.4"; + Profile j2eeProfile = Profile.J2EE_14; // creates a project we will use for the import - NewEarProjectWizardIteratorTest.generateEARProject(prjDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(prjDirF, name, j2eeProfile, serverID, null, null, null, null, null, null); Project earProject = ProjectManager.getDefault().findProject(FileUtil.toFileObject(prjDirF)); EarProjectTest.openProject((EarProject) earProject); diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarProviderTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarProviderTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarProviderTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarProviderTest.java @@ -47,6 +47,7 @@ import org.netbeans.junit.NbTestCase; import org.netbeans.modules.j2ee.api.ejbjar.Ear; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.test.TestUtil; import org.netbeans.modules.j2ee.earproject.ui.wizards.NewEarProjectWizardIteratorTest; import org.openide.filesystems.FileObject; @@ -73,9 +74,9 @@ public void testFindEarJavaEE() throws Exception { File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.JAVA_EE_5; + Profile j2eeProfile = Profile.JAVA_EE_5; String ejbName = "testEA-ejb"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, serverID); + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID); FileObject earDirFO = FileUtil.toFileObject(earDirF); Project createdEjbJarProject = ProjectManager.getDefault().findProject(earDirFO); assertNotNull("Ear found", Ear.getEar(earDirFO)); @@ -88,9 +89,9 @@ public void testFindEarJ2EE() throws Exception { File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.J2EE_14; + Profile j2eeProfile = Profile.J2EE_14; String ejbName = "testEA-ejb"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, serverID); + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID); FileObject earDirFO = FileUtil.toFileObject(earDirF); Project createdEjbJarProject = ProjectManager.getDefault().findProject(earDirFO); assertNotNull("Ear found", Ear.getEar(earDirFO)); diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarTest.java @@ -47,6 +47,7 @@ import org.netbeans.modules.j2ee.api.ejbjar.Ear; import org.netbeans.modules.j2ee.dd.api.application.Application; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.test.TestUtil; import org.netbeans.modules.j2ee.earproject.ui.wizards.NewEarProjectWizardIteratorTest; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProject; @@ -75,16 +76,16 @@ // testing project File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.JAVA_EE_5; + Profile j2eeProfile = Profile.JAVA_EE_5; String ejbName = "testEA-ejb"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID, null, ejbName, null, null, null, null); FileObject earDirFO = FileUtil.toFileObject(earDirF); FileObject ejbProjectFO = earDirFO.getFileObject("testEA-ejb"); assertNotNull(ejbProjectFO); File earDirAnotherF = new File(getWorkDir(), "testEA-another"); - NewEarProjectWizardIteratorTest.generateEARProject(earDirAnotherF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(earDirAnotherF, name, j2eeProfile, serverID, null, null, null, null, null, null); FileObject earDirAnotherFO = FileUtil.toFileObject(earDirAnotherF); EjbJarProject createdEjbJarProject = (EjbJarProject) ProjectManager.getDefault().findProject(ejbProjectFO); diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/model/ApplicationImplTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/model/ApplicationImplTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/model/ApplicationImplTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/model/ApplicationImplTest.java @@ -53,6 +53,7 @@ import org.netbeans.modules.j2ee.dd.api.application.ApplicationMetadata; import org.netbeans.modules.j2ee.dd.api.application.Module; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.EarProject; import org.netbeans.modules.j2ee.earproject.classpath.ClassPathSupportCallbackImpl; import org.netbeans.modules.j2ee.earproject.test.TestUtil; @@ -98,8 +99,8 @@ // create project File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.JAVA_EE_5; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, + Profile j2eeProfile = Profile.JAVA_EE_5; + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID, WEB_NAME, EJB_NAME, CAR_NAME, null, null, null); FileObject prjDirFO = FileUtil.toFileObject(earDirF); diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNodeTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNodeTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNodeTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNodeTest.java @@ -45,6 +45,7 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; import org.netbeans.junit.NbTestCase; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.test.TestUtil; import org.netbeans.modules.j2ee.earproject.ui.wizards.NewEarProjectWizardIteratorTest; import org.netbeans.spi.project.ui.LogicalViewProvider; @@ -77,11 +78,11 @@ public void testRemoveFromJarContent() throws Exception { File prjDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = "1.4"; + Profile j2eeProfile = Profile.J2EE_14; String jarName = "testEA-ejb"; // creates a project we will use for the import - NewEarProjectWizardIteratorTest.generateEARProject(prjDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(prjDirF, name, j2eeProfile, serverInstanceID, null, null, jarName, null, null, null); Project earProject = ProjectManager.getDefault().findProject(FileUtil.toFileObject(prjDirF)); @@ -102,11 +103,11 @@ public void testRemoveFromJarContentWithDeletedProject() throws Exception { File prjDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = "1.4"; + Profile j2eeProfile = Profile.J2EE_14; String jarName = "testEA-ejb"; // creates a project we will use for the import - NewEarProjectWizardIteratorTest.generateEARProject(prjDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(prjDirF, name, j2eeProfile, serverInstanceID, null, null, jarName, null, null, null); FileObject prjDirFO = FileUtil.toFileObject(prjDirF); diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectPropertiesTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectPropertiesTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectPropertiesTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectPropertiesTest.java @@ -57,6 +57,7 @@ import org.netbeans.modules.java.api.common.classpath.ClassPathSupport; import org.netbeans.modules.j2ee.dd.api.application.Application; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.EarProject; import org.netbeans.modules.j2ee.earproject.EarProjectGenerator; import org.netbeans.modules.j2ee.earproject.EarProjectTest; @@ -99,10 +100,10 @@ // create project File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.JAVA_EE_5; + Profile j2eeProfile = Profile.JAVA_EE_5; String ejbName = "testEA-ejb"; String carName = "testEA-app-client"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID, null, ejbName, carName, null, null, null); FileObject prjDirFO = FileUtil.toFileObject(earDirF); EarProject project = (EarProject) ProjectManager.getDefault().findProject(prjDirFO); @@ -132,7 +133,7 @@ public void testPropertiesWithoutDDJ2EE() throws Exception { // see #73751 File proj = new File(getWorkDir(), "EARProject"); AntProjectHelper aph = EarProjectGenerator.createProject(proj, - "test-project", J2eeModule.J2EE_14, serverID, "1.4", null, null); + "test-project", Profile.J2EE_14, serverID, "1.4", null, null); FileObject prjDirFO = aph.getProjectDirectory(); // simulateing #73751 prjDirFO.getFileObject("src/conf/application.xml").delete(); @@ -145,7 +146,7 @@ public void testPropertiesWithoutDDJavaEE() throws Exception { File proj = new File(getWorkDir(), "EARProject"); AntProjectHelper aph = EarProjectGenerator.createProject(proj, - "test-project", J2eeModule.JAVA_EE_5, serverID, "1.5", null, null); + "test-project", Profile.JAVA_EE_5, serverID, "1.5", null, null); FileObject prjDirFO = aph.getProjectDirectory(); assertNull("application should not exist", prjDirFO.getFileObject("src/conf/application.xml")); EarProject p = (EarProject)ProjectManager.getDefault().findProject(prjDirFO); @@ -155,18 +156,18 @@ } public void testPathInEARChangingJ2EE() throws Exception { // see #76008 - testPathInEARChanging(J2eeModule.J2EE_14); + testPathInEARChanging(Profile.J2EE_14); } public void testPathInEARChangingJavaEE() throws Exception { // see #76008 - testPathInEARChanging(J2eeModule.JAVA_EE_5); + testPathInEARChanging(Profile.JAVA_EE_5); } - private void testPathInEARChanging(String j2eeLevel) throws Exception { // see #76008 + private void testPathInEARChanging(Profile j2eeProfile) throws Exception { // see #76008 File earDirF = new File(getWorkDir(), "testEA-1"); String name = "Test EnterpriseApplication"; String ejbName = "testEA-ejb"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID, null, ejbName, null, null, null, null); EarProject earProject = (EarProject) ProjectManager.getDefault().findProject(FileUtil.toFileObject(earDirF)); Application app = earProject.getAppModule().getApplication(); @@ -281,7 +282,7 @@ createData.setName(warName); createData.setServerInstanceID(this.serverID); createData.setSourceStructure(WebProjectUtilities.SRC_STRUCT_BLUEPRINTS); - createData.setJavaEEVersion(EarProjectGenerator.checkJ2eeVersion(J2eeModule.JAVA_EE_5, serverID, J2eeModule.WAR)); + createData.setJavaEEProfile(EarProjectGenerator.getAcceptableProfile(Profile.JAVA_EE_5, serverID, J2eeModule.WAR)); createData.setContextPath("/" + warName); AntProjectHelper webHelper = WebProjectUtilities.createProject(createData); diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIteratorTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIteratorTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIteratorTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIteratorTest.java @@ -61,6 +61,7 @@ import org.netbeans.modules.j2ee.dd.api.application.Module; import org.netbeans.modules.j2ee.dd.api.application.Web; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.EarProject; import org.netbeans.modules.j2ee.earproject.EarProjectTest; import org.netbeans.modules.j2ee.earproject.ModuleType; @@ -85,7 +86,7 @@ private static final String CUSTOM_CONTEXT_ROOT = "/my-context-root"; private String name; - private String j2eeLevel; + private Profile j2eeProfile; private String warName; private String jarName; private String carName; @@ -103,7 +104,7 @@ private void setDefaultValues() { name = "Test EnterpriseApplication"; - j2eeLevel = J2eeModule.JAVA_EE_5; + j2eeProfile = Profile.JAVA_EE_5; warName = "testEA-war"; jarName = "testEA-ejb"; carName = "testEA-app-client"; @@ -127,11 +128,11 @@ } public void testTestableInstantiateBasics() throws Exception { - j2eeLevel = J2eeModule.JAVA_EE_5; + j2eeProfile = Profile.JAVA_EE_5; generateJ2EEApplication(false); File importedDir = new File(getWorkDir(), "testEA-imported"); ImportBlueprintEarWizardIterator.testableInstantiate(platformName, sourceLevel, - j2eeLevel, importedDir, prjDirF, serverInstanceID, name, + j2eeProfile, importedDir, prjDirF, serverInstanceID, name, Collections.emptyMap(), null, null, null); FileObject fo = FileUtil.toFileObject(importedDir); @@ -141,7 +142,7 @@ } public void testTestableInstantiateWitoutDD() throws Exception { - j2eeLevel = J2eeModule.J2EE_14; + j2eeProfile = Profile.J2EE_14; FileObject prjDirFO = generateJ2EEApplication(true); // and Enterprise Application's deployment descriptor @@ -153,7 +154,7 @@ userModules.put(prjDirFO.getFileObject(carName), ModuleType.CLIENT); File importedDir = new File(getWorkDir(), "testEA-imported"); ImportBlueprintEarWizardIterator.testableInstantiate(platformName, sourceLevel, - j2eeLevel, importedDir, prjDirF, serverInstanceID, name, userModules, null, null, null); + j2eeProfile, importedDir, prjDirF, serverInstanceID, name, userModules, null, null, null); FileObject importedDirFO = FileUtil.toFileObject(importedDir); FileObject ddFO = prjDirFO.getFileObject("src/conf/application.xml"); @@ -166,12 +167,12 @@ } public void testTestableInstantiateWithWebAndEJBAndAC() throws Exception { - j2eeLevel = J2eeModule.J2EE_14; + j2eeProfile = Profile.J2EE_14; FileObject prjDirFO = generateJ2EEApplication(true); File importedDir = new File(getWorkDir(), "testEA-imported"); ImportBlueprintEarWizardIterator.testableInstantiate(platformName, sourceLevel, - j2eeLevel, importedDir, prjDirF, serverInstanceID, name, + j2eeProfile, importedDir, prjDirF, serverInstanceID, name, Collections.emptyMap(), null, null, null); assertNotNull("have a backup copy of application.xml", prjDirFO.getFileObject("src/conf/original_application.xml")); @@ -191,12 +192,12 @@ // temporarily(?) turned off public void off_testWebContextRootIsSet() throws Exception { - this.j2eeLevel = "1.4"; + this.j2eeProfile = Profile.J2EE_14; generateJ2EEApplicationWithWeb(); File importedDir = new File(getWorkDir(), "testEA-imported"); ImportBlueprintEarWizardIterator.testableInstantiate(platformName, sourceLevel, - j2eeLevel, importedDir, prjDirF, serverInstanceID, name, + j2eeProfile, importedDir, prjDirF, serverInstanceID, name, Collections.emptyMap(), null, null, null); String importedContextRoot = null; @@ -220,7 +221,7 @@ private FileObject generateJ2EEApplication() throws Exception { // creates a project we will use for the import NewEarProjectWizardIteratorTest.generateEARProject( - prjDirF, name, j2eeLevel, serverInstanceID, + prjDirF, name, j2eeProfile, serverInstanceID, warName, jarName, carName, mainClass, platformName, sourceLevel); // Workaround. Set the context root which should be set automatically. diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIteratorTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIteratorTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIteratorTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIteratorTest.java @@ -52,6 +52,7 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; import org.netbeans.junit.NbTestCase; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.EarProject; import org.netbeans.modules.j2ee.earproject.EarProjectTest; import org.netbeans.modules.j2ee.earproject.TestPlatformProvider; @@ -78,12 +79,12 @@ * May be used for generating project instances in tests. */ public static void generateEARProject( - File prjDirF, String name, String j2eeLevel, + File prjDirF, String name, Profile j2eeProfile, String serverInstanceID, String warName, String jarName, String carName, String mainClass, String platformName, String sourceLevel) throws IOException { NewEarProjectWizardIterator.testableInstantiate(prjDirF, name, - j2eeLevel, serverInstanceID, warName, jarName, + j2eeProfile, serverInstanceID, warName, jarName, carName, mainClass, platformName, sourceLevel, null, null, null); } @@ -94,8 +95,8 @@ * @see #generateEARProject(File, String, String, String, String, String, String, String, String, String) */ public static void generateEARProject(File earDirF, String name, - String j2eeLevel, String serverID) throws IOException { - generateEARProject(earDirF, name, j2eeLevel, serverID, null, null, null, + Profile j2eeProfile, String serverID) throws IOException { + generateEARProject(earDirF, name, j2eeProfile, serverID, null, null, null, null, null, null); } @@ -122,7 +123,7 @@ public void testTestableInstantiate() throws Exception { File dirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = "1.4"; + Profile j2eeProfile = Profile.J2EE_14; String warName = null; String jarName = null; String carName = null; @@ -131,7 +132,7 @@ String sourceLevel = null; Set result = NewEarProjectWizardIterator.testableInstantiate(dirF, name, - j2eeLevel, serverInstanceID, warName, jarName, + j2eeProfile, serverInstanceID, warName, jarName, carName, mainClass, platformName, sourceLevel, null, null, null); Set expResult = new HashSet(); @@ -150,7 +151,7 @@ assertNotNull("application client registered", FileUtil.getConfigFile(resource)); File dirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = "1.4"; + Profile j2eeProfile = Profile.J2EE_14; String warName = null; String jarName = null; String carName = "testEA-app-client"; @@ -159,7 +160,7 @@ String sourceLevel = null; Set result = NewEarProjectWizardIterator.testableInstantiate(dirF, name, - j2eeLevel, serverInstanceID, warName, jarName, + j2eeProfile, serverInstanceID, warName, jarName, carName, mainClass, platformName, sourceLevel, null, null, null); Set expResult = new HashSet(); @@ -182,7 +183,7 @@ assertNotNull("application client registered", FileUtil.getConfigFile(resource)); File dirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = "1.4"; + Profile j2eeProfile = Profile.J2EE_14; String warName = "testEA-war"; String jarName = "testEA-ejb"; String carName = "testEA-app-client"; @@ -191,7 +192,7 @@ String sourceLevel = null; Set result = NewEarProjectWizardIterator.testableInstantiate(dirF, name, - j2eeLevel, serverInstanceID, warName, jarName, + j2eeProfile, serverInstanceID, warName, jarName, carName, mainClass, platformName, sourceLevel, null, null, null); Set expResult = new HashSet(); diff --git a/j2ee.ejbjarproject/manifest.mf b/j2ee.ejbjarproject/manifest.mf --- a/j2ee.ejbjarproject/manifest.mf +++ b/j2ee.ejbjarproject/manifest.mf @@ -2,6 +2,6 @@ OpenIDE-Module: org.netbeans.modules.j2ee.ejbjarproject OpenIDE-Module-Layer: org/netbeans/modules/j2ee/ejbjarproject/ui/resources/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/ejbjarproject/Bundle.properties -OpenIDE-Module-Specification-Version: 1.15 +OpenIDE-Module-Specification-Version: 1.16 AutoUpdate-Show-In-Client: false diff --git a/j2ee.ejbjarproject/nbproject/project.xml b/j2ee.ejbjarproject/nbproject/project.xml --- a/j2ee.ejbjarproject/nbproject/project.xml +++ b/j2ee.ejbjarproject/nbproject/project.xml @@ -155,7 +155,7 @@ 1 - 1.36 + 1.38 @@ -214,7 +214,7 @@ 4 - 1.53 + 1.58 diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarPersistenceProvider.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarPersistenceProvider.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarPersistenceProvider.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarPersistenceProvider.java @@ -52,6 +52,7 @@ import org.netbeans.api.java.classpath.ClassPath; import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Capabilities; import org.netbeans.modules.java.api.common.classpath.ClassPathProviderImpl; import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; @@ -222,18 +223,7 @@ } public boolean supportsDefaultProvider() { - J2eeModuleProvider j2eeModuleProvider = project.getLookup().lookup(J2eeModuleProvider.class); - J2eePlatform platform = Deployment.getDefault().getJ2eePlatform(j2eeModuleProvider.getServerInstanceID()); - - if (platform == null){ - // server probably not registered, can't resolve whether default provider is supported (see #79856) - return false; - } - - Set supportedVersions = platform.getSupportedSpecVersions(j2eeModuleProvider.getJ2eeModule().getModuleType()); - - return supportedVersions.contains(J2eeModule.JAVA_EE_5) - && platform.isToolSupported("defaultPersistenceProviderJavaEE5"); // NOI18N + return Capabilities.forProject(project).hasDefaultPersistenceProvider(); } /** diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProvider.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProvider.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProvider.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProvider.java @@ -57,6 +57,7 @@ import org.netbeans.api.project.SourceGroup; import org.netbeans.api.project.Sources; import org.netbeans.api.project.ui.OpenProjects; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.java.api.common.classpath.ClassPathProviderImpl; import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties; import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider; @@ -84,6 +85,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.api.ModuleChangeReporter; +import org.netbeans.modules.j2ee.ejbjarproject.ui.customizer.EjbJarCompositePanelProvider; import org.netbeans.modules.java.api.common.project.ProjectProperties; import org.netbeans.modules.websvc.spi.webservices.WebServicesConstants; @@ -121,7 +123,7 @@ if (metaInfFo != null) { ddFO = metaInfFo.getFileObject(FILE_DD); } - if (ddFO == null && !J2EEProjectProperties.JAVA_EE_5.equals(getJ2eePlatformVersion())) { + if (ddFO == null && !EjbProjectConstants.JAVA_EE_5_LEVEL.equals(getJ2eePlatformVersion())) { // ...generate the DD from template... } return ddFO; @@ -160,8 +162,8 @@ /** Package-private for unit test only. */ static boolean needConfigurationFolder(final String version) { - return J2EEProjectProperties.J2EE_1_3.equals(version) || - J2EEProjectProperties.J2EE_1_4.equals(version); + return EjbProjectConstants.J2EE_13_LEVEL.equals(version) || + EjbProjectConstants.J2EE_14_LEVEL.equals(version); } public File getMetaInfAsFile() { diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectCreateData.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectCreateData.java new file mode 100644 --- /dev/null +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectCreateData.java @@ -0,0 +1,154 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.j2ee.ejbjarproject.api; + +import java.io.File; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; + +/** + * + * @author Petr Hejl + */ +public final class EjbJarProjectCreateData { + + private File projectDir; + + private String name; + + private Profile javaEEProfile; + + private String serverInstanceID; + + private String librariesDefinition; + + private String serverLibraryName; + + private File[] sourceFolders; + + private File[] testFolders; + + private File configFilesBase; + + private File libFolder; + + public EjbJarProjectCreateData() { + } + + public Profile getJavaEEProfile() { + return javaEEProfile; + } + + public void setJavaEEProfile(Profile javaEEProfile) { + this.javaEEProfile = javaEEProfile; + } + + public String getLibrariesDefinition() { + return librariesDefinition; + } + + public void setLibrariesDefinition(String librariesDefinition) { + this.librariesDefinition = librariesDefinition; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public File getProjectDir() { + return projectDir; + } + + public void setProjectDir(File projectDir) { + this.projectDir = projectDir; + } + + public String getServerInstanceID() { + return serverInstanceID; + } + + public void setServerInstanceID(String serverInstanceID) { + this.serverInstanceID = serverInstanceID; + } + + public String getServerLibraryName() { + return serverLibraryName; + } + + public void setServerLibraryName(String serverLibraryName) { + this.serverLibraryName = serverLibraryName; + } + + public File getConfigFilesBase() { + return configFilesBase; + } + + public void setConfigFilesBase(File configFilesBase) { + this.configFilesBase = configFilesBase; + } + + public File getLibFolder() { + return libFolder; + } + + public void setLibFolder(File libFolder) { + this.libFolder = libFolder; + } + + public File[] getSourceFolders() { + return sourceFolders; + } + + public void setSourceFolders(File[] sourceFolders) { + this.sourceFolders = sourceFolders; + } + + public File[] getTestFolders() { + return testFolders; + } + + public void setTestFolders(File[] testFolders) { + this.testFolders = testFolders; + } + +} diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectGenerator.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectGenerator.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectGenerator.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectGenerator.java @@ -61,7 +61,6 @@ import org.netbeans.api.project.libraries.LibraryManager; import org.netbeans.api.queries.FileEncodingQuery; import org.netbeans.modules.j2ee.common.SharabilityUtility; -import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.support.ant.EditableProperties; import org.netbeans.spi.project.support.ant.ProjectGenerator; @@ -70,6 +69,7 @@ import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProject; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProjectType; import org.netbeans.modules.j2ee.ejbjarproject.Utils; @@ -116,33 +116,51 @@ * @param serverInstanceID server instance ID * @return the helper object permitting it to be further customized * @throws IOException in case something went wrong + * @deprecated */ public static AntProjectHelper createProject(File dir, final String name, final String j2eeLevel, final String serverInstanceID) throws IOException { return createProject(dir, name, j2eeLevel, serverInstanceID, null, null); } - + + @Deprecated public static AntProjectHelper createProject(File dir, final String name, final String j2eeLevel, final String serverInstanceID, final String librariesDefinition, final String serverLibraryName) throws IOException { + + EjbJarProjectCreateData createData = new EjbJarProjectCreateData(); + createData.setProjectDir(dir); + createData.setName(name); + createData.setJavaEEProfile(Profile.fromPropertiesString(j2eeLevel)); + createData.setServerInstanceID(serverInstanceID); + createData.setLibrariesDefinition(librariesDefinition); + createData.setServerLibraryName(serverLibraryName); + return createProject(createData); + } + + public static AntProjectHelper createProject(final EjbJarProjectCreateData createData) throws IOException { + File dir = createData.getProjectDir(); + final FileObject projectDir = FileUtil.createFolder(dir); final AntProjectHelper[] h = new AntProjectHelper[1]; - + // create project in one FS atomic action: FileSystem fs = projectDir.getFileSystem(); fs.runAtomicAction(new FileSystem.AtomicAction() { public void run() throws IOException { - AntProjectHelper helper = createProjectImpl(projectDir, name, - j2eeLevel, serverInstanceID, librariesDefinition, serverLibraryName); + AntProjectHelper helper = createProjectImpl(createData, projectDir); h[0] = helper; }}); return h[0]; } - private static AntProjectHelper createProjectImpl(FileObject projectDir, String name, - String j2eeLevel, final String serverInstanceID, final String librariesDefinition, final String serverLibraryName) throws IOException { - + private static AntProjectHelper createProjectImpl(final EjbJarProjectCreateData createData, + final FileObject projectDir) throws IOException { + + String name = createData.getName(); + String serverInstanceID = createData.getServerInstanceID(); + FileObject srcRoot = projectDir.createFolder(DEFAULT_SRC_FOLDER); // NOI18N srcRoot.createFolder(DEFAULT_JAVA_FOLDER); //NOI18N projectDir.createFolder(DEFAULT_TEST_FOLDER); @@ -151,12 +169,12 @@ //create a default manifest FileUtil.copyFile(FileUtil.getConfigFile("org-netbeans-modules-j2ee-ejbjarproject/MANIFEST.MF"), confRoot, "MANIFEST"); //NOI18N - final String realServerLibraryName = configureServerLibrary(librariesDefinition, - serverInstanceID, projectDir, serverLibraryName != null); + final String realServerLibraryName = configureServerLibrary(createData.getLibrariesDefinition(), + serverInstanceID, projectDir, createData.getServerLibraryName() != null); final AntProjectHelper h = setupProject(projectDir, name, - "src", "test", null, null, null, j2eeLevel, serverInstanceID, - librariesDefinition, realServerLibraryName); + "src", "test", null, null, null, createData.getJavaEEProfile(), serverInstanceID, + createData.getLibrariesDefinition(), realServerLibraryName); EditableProperties ep = h.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); ep.put(EjbJarProjectProperties.SOURCE_ROOT, DEFAULT_SRC_FOLDER); //NOI18N @@ -174,7 +192,7 @@ try { ProjectManager.mutex().writeAccess(new Mutex.ExceptionAction() { public Void run() throws Exception { - copyRequiredLibraries(h, refHelper, serverInstanceID, serverLibraryName); + copyRequiredLibraries(h, refHelper, createData); return null; } }); @@ -183,7 +201,7 @@ } // create ejb-jar.xml - if (!J2eeModule.JAVA_EE_5.equals(j2eeLevel)) { + if (!Profile.JAVA_EE_5.equals(createData.getJavaEEProfile())) { String resource = "org-netbeans-modules-j2ee-ejbjarproject/ejb-jar-2.1.xml"; FileObject ddFile = FileUtil.copyFile(FileUtil.getConfigFile(resource), confRoot, "ejb-jar"); //NOI18N EjbJar ejbJar = DDProvider.getDefault().getDDRoot(ddFile); @@ -235,7 +253,8 @@ ProjectManager.getDefault().saveProject(subP); return retVal; } - + + @Deprecated public static AntProjectHelper importProject(final File dir, final String name, final File[] sourceFolders, final File[] testFolders, final File configFilesBase, final File libFolder, final String j2eeLevel, @@ -244,46 +263,68 @@ return importProject(dir, name, sourceFolders, testFolders, configFilesBase, libFolder, j2eeLevel, serverInstanceID, null, null); } - + + @Deprecated public static AntProjectHelper importProject(final File dir, final String name, final File[] sourceFolders, final File[] testFolders, final File configFilesBase, final File libFolder, final String j2eeLevel, final String serverInstanceID, final String librariesDefinition, final String serverLibraryName) throws IOException { + + EjbJarProjectCreateData createData = new EjbJarProjectCreateData(); + createData.setProjectDir(dir); + createData.setName(name); + createData.setSourceFolders(sourceFolders); + createData.setTestFolders(testFolders); + createData.setConfigFilesBase(configFilesBase); + createData.setLibFolder(libFolder); + createData.setJavaEEProfile(Profile.fromPropertiesString(j2eeLevel)); + createData.setServerInstanceID(serverInstanceID); + createData.setLibrariesDefinition(librariesDefinition); + createData.setServerLibraryName(serverLibraryName); + return importProject(createData); + } + + public static AntProjectHelper importProject(final EjbJarProjectCreateData createData) throws IOException { + File dir = createData.getProjectDir(); + assert dir != null: "Project folder can't be null"; //NOI18N final FileObject projectDir = FileUtil.createFolder(dir); final AntProjectHelper[] h = new AntProjectHelper[1]; - + // create project in one FS atomic action: FileSystem fs = projectDir.getFileSystem(); fs.runAtomicAction(new FileSystem.AtomicAction() { public void run() throws IOException { - AntProjectHelper helper = importProjectImpl(projectDir, name, sourceFolders, testFolders, - configFilesBase, libFolder, j2eeLevel, serverInstanceID, librariesDefinition, serverLibraryName); + AntProjectHelper helper = importProjectImpl(createData, projectDir); h[0] = helper; }}); return h[0]; - } + } - private static AntProjectHelper importProjectImpl(final FileObject projectDir, final String name, - final File[] sourceFolders, final File[] testFolders, - final File configFilesBase, final File libFolder, final String j2eeLevel, - final String serverInstanceID, String librariesDefinition, final String serverLibraryName) throws IOException { - + private static AntProjectHelper importProjectImpl(final EjbJarProjectCreateData createData, + final FileObject projectDir) throws IOException { + + String name = createData.getName(); + final File[] sourceFolders = createData.getSourceFolders(); + final File[] testFolders = createData.getTestFolders(); + Profile j2eeProfile = createData.getJavaEEProfile(); + String serverInstanceID = createData.getServerInstanceID(); + assert sourceFolders != null && testFolders != null: "Package roots can't be null"; //NOI18N // this constructor creates only java application type - final String realServerLibraryName = configureServerLibrary(librariesDefinition, - serverInstanceID, projectDir, serverLibraryName != null); + final String realServerLibraryName = configureServerLibrary(createData.getLibrariesDefinition(), + serverInstanceID, projectDir, createData.getServerLibraryName() != null); final AntProjectHelper h = setupProject(projectDir, name, null, null, - configFilesBase, - (libFolder == null ? null : libFolder), + createData.getConfigFilesBase(), + createData.getLibFolder(), null, - j2eeLevel, + j2eeProfile, serverInstanceID, - librariesDefinition, + createData.getLibrariesDefinition(), realServerLibraryName); final EjbJarProject p = (EjbJarProject) ProjectManager.getDefault().findProject(projectDir); @@ -330,7 +371,7 @@ } } h.putPrimaryConfigurationData(data,true); - copyRequiredLibraries(h, refHelper, serverInstanceID, serverLibraryName); + copyRequiredLibraries(h, refHelper, createData); ProjectManager.getDefault().saveProject(p); return null; } @@ -342,12 +383,12 @@ } // AB: fix for #53170: if j2eeLevel is 1.4 and ejb-jar.xml is version 2.0, we upgrade it to version 2.1 - FileObject ejbJarXml = FileUtil.toFileObject(configFilesBase).getFileObject("ejb-jar.xml"); // NOI18N + FileObject ejbJarXml = FileUtil.toFileObject(createData.getConfigFilesBase()).getFileObject("ejb-jar.xml"); // NOI18N if (ejbJarXml != null) { try { EjbJar root = DDProvider.getDefault().getDDRoot(ejbJarXml); boolean writeDD = false; - if (new BigDecimal(EjbJar.VERSION_2_0).equals(root.getVersion()) && j2eeLevel.equals(J2EEProjectProperties.J2EE_1_4)) { // NOI18N + if (new BigDecimal(EjbJar.VERSION_2_0).equals(root.getVersion()) && Profile.J2EE_14.equals(j2eeProfile)) { // NOI18N root.setVersion(new BigDecimal(EjbJar.VERSION_2_1)); writeDD = true; } @@ -367,8 +408,7 @@ return h; } - private static void copyRequiredLibraries(AntProjectHelper h, ReferenceHelper rh, - String serverInstanceId, String serverlibraryName) throws IOException { + private static void copyRequiredLibraries(AntProjectHelper h, ReferenceHelper rh, EjbJarProjectCreateData data) throws IOException { if (!h.isSharableProject()) { return; @@ -422,7 +462,7 @@ private static AntProjectHelper setupProject(FileObject dirFO, String name, String srcRoot, String testRoot, File configFiles, File libraries, String resources, - String j2eeLevel, String serverInstanceID, String librariesDefinition, String serverLibraryName) throws IOException { + Profile j2eeProfile, String serverInstanceID, String librariesDefinition, String serverLibraryName) throws IOException { Utils.logUI(NbBundle.getBundle(EjbJarProjectGenerator.class), "UI_EJB_PROJECT_CREATE_SHARABILITY", // NOI18N new Object[]{Boolean.valueOf(librariesDefinition != null), Boolean.valueOf(serverLibraryName != null)}); @@ -484,7 +524,7 @@ ep.setProperty(EjbJarProjectProperties.DIST_JAR, "${"+EjbJarProjectProperties.DIST_DIR+"}/" + "${" + EjbJarProjectProperties.JAR_NAME + "}"); //XXX the name of the dist.ear.jar file should be different, but now it cannot be since the name is used as a key in module provider mapping ep.setProperty(EjbJarProjectProperties.DIST_EAR_JAR, "${"+EjbJarProjectProperties.DIST_DIR+"}/" + "${" + EjbJarProjectProperties.JAR_NAME + "}"); - ep.setProperty(EjbJarProjectProperties.J2EE_PLATFORM, j2eeLevel); + ep.setProperty(EjbJarProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); ep.setProperty(EjbJarProjectProperties.JAR_NAME, PropertyUtils.getUsablePropertyName(name) + ".jar"); ep.setProperty(EjbJarProjectProperties.JAR_COMPRESS, "false"); // ep.setProperty(EjbJarProjectProperties.JAR_CONTENT_ADDITIONAL, ""); @@ -581,9 +621,9 @@ // set j2ee.platform.classpath J2eePlatform j2eePlatform = Deployment.getDefault().getJ2eePlatform(serverInstanceID); - if (!j2eePlatform.getSupportedSpecVersions(J2eeModule.EJB).contains(j2eeLevel)) { + if (!j2eePlatform.getSupportedProfiles(J2eeModule.EJB).contains(j2eeProfile)) { Logger.getLogger("global").log(Level.WARNING, - "J2EE level:" + j2eeLevel + " not supported by server " + Deployment.getDefault().getServerInstanceDisplayName(serverInstanceID) + " for module type EJB"); // NOI18N + "J2EE level:" + j2eeProfile + " not supported by server " + Deployment.getDefault().getServerInstanceDisplayName(serverInstanceID) + " for module type EJB"); // NOI18N } if (!h.isSharableProject() || serverLibraryName == null) { diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbJarLogicalViewProvider.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbJarLogicalViewProvider.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbJarLogicalViewProvider.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbJarLogicalViewProvider.java @@ -92,6 +92,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProject; import org.netbeans.modules.j2ee.spi.ejbjar.support.J2eeProjectView; @@ -477,15 +478,15 @@ } public void actionPerformed(ActionEvent e) { - String j2eeSpec = project.evaluator().getProperty(EjbJarProjectProperties.J2EE_PLATFORM); - if (j2eeSpec == null) { - j2eeSpec = J2EEProjectProperties.JAVA_EE_5; // NOI18N + Profile j2eeProfile = Profile.fromPropertiesString(project.evaluator().getProperty(EjbJarProjectProperties.J2EE_PLATFORM)); + if (j2eeProfile == null) { + j2eeProfile = Profile.JAVA_EE_5; Logger.getLogger(EjbJarLogicalViewProvider.class.getName()).warning( "project ["+project.getProjectDirectory()+"] is missing "+EjbJarProjectProperties.J2EE_PLATFORM+". " + // NOI18N - "default value will be used instead: "+j2eeSpec); // NOI18N - updateJ2EESpec(project, project.getAntProjectHelper(), j2eeSpec); + "default value will be used instead: "+j2eeProfile); // NOI18N + updateJ2EESpec(project, project.getAntProjectHelper(), j2eeProfile); } - String instance = BrokenServerSupport.selectServer(j2eeSpec, J2eeModule.EJB); + String instance = BrokenServerSupport.selectServer(j2eeProfile, J2eeModule.EJB); if (instance != null) { EjbJarProjectProperties.setServerInstance( project, helper, instance); @@ -493,12 +494,12 @@ checkMissingServer(); } - private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final String j2eeSpec) { + private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final Profile j2eeProfile) { ProjectManager.mutex().postWriteRequest(new Runnable() { public void run() { try { EditableProperties projectProps = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); - projectProps.put(EjbJarProjectProperties.J2EE_PLATFORM, j2eeSpec); + projectProps.put(EjbJarProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); helper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, projectProps); ProjectManager.getDefault().saveProject(project); } catch (IOException e) { diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarCompositePanelProvider.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarCompositePanelProvider.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarCompositePanelProvider.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarCompositePanelProvider.java @@ -45,6 +45,7 @@ import java.util.ResourceBundle; import javax.swing.JComponent; import javax.swing.JPanel; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProject; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProvider; @@ -193,7 +194,7 @@ private static boolean showWebServicesCategory(EjbJarProjectProperties uiProperties) { EjbJarProject project = (EjbJarProject) uiProperties.getProject(); - if(J2EEProjectProperties.J2EE_1_4.equals(project.getEjbModule().getJ2eePlatformVersion())) { + if(EjbProjectConstants.J2EE_14_LEVEL.equals(project.getEjbModule().getJ2eePlatformVersion())) { return WebServicesSupport.getWebServicesSupport(project.getProjectDirectory())!=null; } return false; diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarProjectProperties.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarProjectProperties.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarProjectProperties.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarProjectProperties.java @@ -91,6 +91,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProject; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProjectType; import org.netbeans.modules.j2ee.ejbjarproject.Utils; @@ -313,8 +314,8 @@ PLATFORM_MODEL = PlatformUiSupport.createPlatformComboBoxModel (evaluator.getProperty(JAVA_PLATFORM)); PLATFORM_LIST_RENDERER = PlatformUiSupport.createPlatformListCellRenderer(); SpecificationVersion minimalSourceLevel = null; - if (J2EEProjectProperties.JAVA_EE_5.equals(evaluator.getProperty(J2EE_PLATFORM))) { - minimalSourceLevel = new SpecificationVersion(J2EEProjectProperties.JAVA_EE_5); + if (Profile.JAVA_EE_5.equals(Profile.fromPropertiesString(evaluator.getProperty(J2EE_PLATFORM)))) { + minimalSourceLevel = new SpecificationVersion("1.5"); } JAVAC_SOURCE_MODEL = PlatformUiSupport.createSourceLevelComboBoxModel (PLATFORM_MODEL, evaluator.getProperty(JAVAC_SOURCE), evaluator.getProperty(JAVAC_TARGET), minimalSourceLevel); JAVAC_SOURCE_RENDERER = PlatformUiSupport.createSourceLevelListCellRenderer (); @@ -474,10 +475,10 @@ } // Update the deployment descriptor if upgrading from J2EE 1.3 to 1.4 and set the new J2EE spec version - String oldJ2eeVersion = projectProperties.getProperty(J2EE_PLATFORM); - String newJ2eeVersion = J2eePlatformUiSupport.getSpecVersion(J2EE_PLATFORM_MODEL.getSelectedItem()); + Profile oldJ2eeVersion = Profile.fromPropertiesString(projectProperties.getProperty(J2EE_PLATFORM)); + Profile newJ2eeVersion = J2eePlatformUiSupport.getJavaEEProfile(J2EE_PLATFORM_MODEL.getSelectedItem()); if (oldJ2eeVersion != null && newJ2eeVersion != null) { - if (oldJ2eeVersion.equals(J2EEProjectProperties.J2EE_1_3) && newJ2eeVersion.equals(J2EEProjectProperties.J2EE_1_4)) { + if (oldJ2eeVersion.equals(Profile.J2EE_13) && newJ2eeVersion.equals(Profile.J2EE_14)) { org.netbeans.modules.j2ee.api.ejbjar.EjbJar ejbJarModules[] = org.netbeans.modules.j2ee.api.ejbjar.EjbJar.getEjbJars(project); if (ejbJarModules.length > 0) { FileObject ddFo = ejbJarModules[0].getDeploymentDescriptor(); @@ -492,7 +493,7 @@ } // Set the new J2EE spec version - projectProperties.setProperty(J2EE_PLATFORM, newJ2eeVersion); + projectProperties.setProperty(J2EE_PLATFORM, newJ2eeVersion.toPropertiesString()); } projectProperties.putAll(additionalProperties); diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/Bundle.properties b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/Bundle.properties --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/Bundle.properties +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/Bundle.properties @@ -85,10 +85,6 @@ LBL_NWP1_AddToEApp_CheckBox=Add to Enterprise &Application\: -J2EESpecLevel_15=Java EE 5 -J2EESpecLevel_14=J2EE 1.4 -J2EESpecLevel_13=J2EE 1.3 - J2EESpecLevel_Desc_14=J2EE 1.4 includes EJB specification 2.1.\n\nThis specification level is supported by servers like Sun Java System Application Server Platform Edition 8 LBL_NWP1_SetAsMain_CheckBoxMnemonic=M diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/ImportEjbJarProjectWizardIterator.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/ImportEjbJarProjectWizardIterator.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/ImportEjbJarProjectWizardIterator.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/ImportEjbJarProjectWizardIterator.java @@ -65,11 +65,13 @@ import org.netbeans.modules.j2ee.common.project.ui.ProjectLocationWizardPanel; import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProject; import org.openide.util.NbBundle; import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectGenerator; import org.netbeans.modules.j2ee.ejbjarproject.Utils; +import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectCreateData; import org.netbeans.spi.project.support.ant.AntProjectHelper; @@ -127,15 +129,25 @@ File configFilesFolder = (File) wiz.getProperty(WizardProperties.CONFIG_FILES_FOLDER); File libName = (File) wiz.getProperty(WizardProperties.LIB_FOLDER); String serverInstanceID = (String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID); - String j2eeLevel = (String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); + Profile j2eeProfile = (Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); String librariesDefinition = SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES)); String serverLibraryName = (String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY); - - AntProjectHelper h = EjbJarProjectGenerator.importProject(dirF, name, - sourceFolders, testFolders, configFilesFolder, libName, - j2eeLevel, serverInstanceID, librariesDefinition, serverLibraryName); + + EjbJarProjectCreateData createData = new EjbJarProjectCreateData(); + createData.setProjectDir(dirF); + createData.setName(name); + createData.setSourceFolders(sourceFolders); + createData.setTestFolders(testFolders); + createData.setConfigFilesBase(configFilesFolder); + createData.setLibFolder(libName); + createData.setServerInstanceID(serverInstanceID); + createData.setJavaEEProfile(j2eeProfile); + createData.setLibrariesDefinition(librariesDefinition); + createData.setServerLibraryName(serverLibraryName); + + AntProjectHelper h = EjbJarProjectGenerator.importProject(createData); handle.progress(2); FileObject dir = FileUtil.toFileObject (dirF); diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/NewEjbJarProjectWizardIterator.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/NewEjbJarProjectWizardIterator.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/NewEjbJarProjectWizardIterator.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/NewEjbJarProjectWizardIterator.java @@ -59,6 +59,7 @@ import org.netbeans.modules.j2ee.common.project.ui.ProjectLocationWizardPanel; import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProject; import org.netbeans.spi.project.support.ant.AntProjectHelper; @@ -68,6 +69,7 @@ import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectGenerator; import org.netbeans.modules.j2ee.ejbjarproject.Utils; +import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectCreateData; import org.netbeans.spi.java.project.support.ui.SharableLibrariesUtils; import org.netbeans.spi.project.ui.support.ProjectChooser; import org.openide.util.NbBundle; @@ -113,15 +115,17 @@ if (dirF != null) { dirF = FileUtil.normalizeFile(dirF); } - String name = (String) wiz.getProperty(ProjectLocationWizardPanel.NAME); - String serverInstanceID = (String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID); - String j2eeLevel = (String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); - String librariesDefinition = - SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES)); - String serverLibraryName = (String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY); - AntProjectHelper h = EjbJarProjectGenerator.createProject(dirF, name, - j2eeLevel, serverInstanceID, librariesDefinition, serverLibraryName); + EjbJarProjectCreateData createData = new EjbJarProjectCreateData(); + createData.setProjectDir(dirF); + createData.setName((String) wiz.getProperty(ProjectLocationWizardPanel.NAME)); + createData.setServerInstanceID((String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID)); + createData.setJavaEEProfile((Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL)); + createData.setLibrariesDefinition( + SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES))); + createData.setServerLibraryName((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY)); + + AntProjectHelper h = EjbJarProjectGenerator.createProject(createData); handle.progress(2); FileObject dir = FileUtil.toFileObject(dirF); @@ -136,8 +140,8 @@ } // remember last used server - UserProjectSettings.getDefault().setLastUsedServer(serverInstanceID); - SharableLibrariesUtils.setLastProjectSharable(librariesDefinition != null); + UserProjectSettings.getDefault().setLastUsedServer(createData.getServerInstanceID()); + SharableLibrariesUtils.setLastProjectSharable(createData.getLibrariesDefinition() != null); // downgrade the Java platform or src level to 1.4 String platformName = (String)wiz.getProperty(ProjectServerWizardPanel.JAVA_PLATFORM); diff --git a/j2ee.ejbjarproject/test/unit/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProviderTest.java b/j2ee.ejbjarproject/test/unit/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProviderTest.java --- a/j2ee.ejbjarproject/test/unit/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProviderTest.java +++ b/j2ee.ejbjarproject/test/unit/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProviderTest.java @@ -44,6 +44,7 @@ import java.io.File; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties; import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata; import org.netbeans.modules.j2ee.dd.api.webservices.WebservicesMetadata; @@ -139,11 +140,11 @@ public void testNeedConfigurationFolder() { assertTrue("1.3 needs configuration folder", - EjbJarProvider.needConfigurationFolder(J2EEProjectProperties.J2EE_1_3)); + EjbJarProvider.needConfigurationFolder(EjbProjectConstants.J2EE_13_LEVEL)); assertTrue("1.4 needs configuration folder", - EjbJarProvider.needConfigurationFolder(J2EEProjectProperties.J2EE_1_4)); + EjbJarProvider.needConfigurationFolder(EjbProjectConstants.J2EE_14_LEVEL)); assertFalse("5.0 does not need configuration folder", - EjbJarProvider.needConfigurationFolder(J2EEProjectProperties.JAVA_EE_5)); + EjbJarProvider.needConfigurationFolder(EjbProjectConstants.JAVA_EE_5_LEVEL)); assertFalse("Anything else does not need configuration folder", EjbJarProvider.needConfigurationFolder("5.0")); assertFalse("Anything else does not need configuration folder", diff --git a/j2eeserver/nbproject/project.properties b/j2eeserver/nbproject/project.properties --- a/j2eeserver/nbproject/project.properties +++ b/j2eeserver/nbproject/project.properties @@ -39,7 +39,7 @@ is.autoload=true javac.source=1.5 -spec.version.base=1.57.0 +spec.version.base=1.58.0 javadoc.overview=${basedir}/api/doc/overview.html javadoc.arch=${basedir}/arch.xml diff --git a/j2eeserver/nbproject/project.xml b/j2eeserver/nbproject/project.xml --- a/j2eeserver/nbproject/project.xml +++ b/j2eeserver/nbproject/project.xml @@ -334,6 +334,7 @@ org.netbeans.modules.j2ee.deployment.common.api org.netbeans.modules.j2ee.deployment.devmodules.api + org.netbeans.modules.j2ee.deployment.devmodules.capabilities org.netbeans.modules.j2ee.deployment.devmodules.spi org.netbeans.modules.j2ee.deployment.plugins.api org.netbeans.modules.j2ee.deployment.plugins.spi diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Bundle.properties b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Bundle.properties --- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Bundle.properties +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Bundle.properties @@ -50,3 +50,10 @@ TXT_ServerManager=Servers CTL_Close=Close AD_Close=Close + +J2EE13.displayName=J2EE 1.3 +J2EE14.displayName=J2EE 1.4 +JavaEE5.displayName=Java EE 5 +JavaEE6Full.displayName=Java EE 6 +JavaEE6Web.displayName=Java EE 6 Web + diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Capabilities.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Capabilities.java new file mode 100644 --- /dev/null +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Capabilities.java @@ -0,0 +1,93 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.j2ee.deployment.devmodules.api; + +import java.util.Set; +import org.netbeans.api.project.Project; +import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; + +/** + * + * @author Petr Hejl + */ +public final class Capabilities { + + private final J2eeModuleProvider provider; + + private Capabilities(J2eeModuleProvider provider) { + this.provider = provider; + } + + public static Capabilities forProject(Project project) { + J2eeModuleProvider provider = project.getLookup().lookup(J2eeModuleProvider.class); + if (provider == null) { + return null; + } + return new Capabilities(provider); + } + +// public boolean isEJB21Supported() { +// return false; +// } +// +// public boolean isEJB30Supported() { +// return false; +// } +// +// public boolean isEJB31Supported() { +// return false; +// } +// +// public boolean isEJB31LiteSupported() { +// return false; +// } + + public boolean hasDefaultPersistenceProvider() { + J2eePlatform platform = Deployment.getDefault().getJ2eePlatform(provider.getServerInstanceID()); + if (platform == null) { + // server probably not registered, can't resolve whether default provider is supported (see #79856) + return false; + } + + Set profiles = platform.getSupportedProfiles(provider.getJ2eeModule().getModuleType()); + return (profiles.contains(Profile.JAVA_EE_5) || profiles.contains(Profile.JAVA_EE_6_FULL)) + && platform.isToolSupported("defaultPersistenceProviderJavaEE5"); + } +} diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Deployment.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Deployment.java --- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Deployment.java +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Deployment.java @@ -49,6 +49,7 @@ import java.util.logging.Level; import javax.enterprise.deploy.spi.Target; import javax.enterprise.deploy.spi.status.ProgressObject; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.common.api.Datasource; import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException; import org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener; @@ -333,7 +334,7 @@ * @since 1.6 */ public String[] getServerInstanceIDs(Object[] moduleTypes) { - return getServerInstanceIDs(moduleTypes, null, null); + return getServerInstanceIDs(moduleTypes, (Profile) null, null); } /** @@ -346,10 +347,15 @@ * @return ServerInstanceIDs of all registered server instances that meet * the specified requirements. * @since 1.6 + * @deprecated use {@link #getServerInstanceIDs(java.lang.Object[], org.netbeans.modules.j2ee.deployment.devmodules.api.Profile)} */ public String[] getServerInstanceIDs(Object[] moduleTypes, String specVersion) { return getServerInstanceIDs(moduleTypes, specVersion, null); } + + public String[] getServerInstanceIDs(Object[] moduleTypes, Profile profile) { + return getServerInstanceIDs(moduleTypes, profile, null); + } /** * Return ServerInstanceIDs of all registered server instances that support @@ -362,6 +368,7 @@ * @return ServerInstanceIDs of all registered server instances that meet * the specified requirements. * @since 1.6 + * @deprecated use {@link #getServerInstanceIDs(java.lang.Object[], org.netbeans.modules.j2ee.deployment.capabilities.Profile, java.lang.String[]) } */ public String[] getServerInstanceIDs(Object[] moduleTypes, String specVersion, String[] tools) { List result = new ArrayList(); @@ -370,14 +377,14 @@ J2eePlatform platform = getJ2eePlatform(serverInstanceIDs[i]); if (platform != null) { boolean isOk = true; - if (moduleTypes != null) { + if (moduleTypes != null) { Set platModuleTypes = platform.getSupportedModuleTypes(); for (int j = 0; j < moduleTypes.length; j++) { if (!platModuleTypes.contains(moduleTypes[j])) { isOk = false; } } - } + } if (isOk && specVersion != null) { Set platSpecVers = platform.getSupportedSpecVersions(); if (specVersion.equals(J2eeModule.J2EE_13)) { @@ -402,6 +409,46 @@ return (String[])result.toArray(new String[result.size()]); } + public String[] getServerInstanceIDs(Object[] moduleTypes, Profile profile, String[] tools) { + List result = new ArrayList(); + String[] serverInstanceIDs = getServerInstanceIDs(); + for (int i = 0; i < serverInstanceIDs.length; i++) { + J2eePlatform platform = getJ2eePlatform(serverInstanceIDs[i]); + if (platform != null) { + boolean isOk = true; + if (moduleTypes != null) { + Set platModuleTypes = platform.getSupportedModuleTypes(); + for (int j = 0; j < moduleTypes.length; j++) { + if (!platModuleTypes.contains(moduleTypes[j])) { + isOk = false; + } + } + } + if (isOk && profile != null) { + boolean supported = false; + for (Profile prof : platform.getSupportedProfiles()) { + if (prof == profile) { + supported = true; + break; + } + } + isOk = supported; + } + if (isOk && tools != null) { + for (int j = 0; j < tools.length; j++) { + if (!platform.isToolSupported(tools[j])) { + isOk = false; + } + } + } + if (isOk) { + result.add(serverInstanceIDs[i]); + } + } + } + return (String[]) result.toArray(new String[result.size()]); + } + /** * Returns the display name of the instance identified by the given id. * diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eeModule.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eeModule.java --- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eeModule.java +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eeModule.java @@ -43,7 +43,6 @@ import java.beans.PropertyChangeListener; import java.io.File; -import org.netbeans.modules.j2ee.dd.api.common.RootInterface; import org.netbeans.modules.j2ee.deployment.config.J2eeModuleAccessor; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleImplementation; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; @@ -83,23 +82,26 @@ /** The module is an Client Application archive. */ public static final Object CLIENT = ModuleType.CAR; - /** - * J2EE specification version 1.3 + /** + * J2EE specification version 1.3 * @since 1.5 + * @deprecated use {@link Profile#J2EE_13} */ public static final String J2EE_13 = "1.3"; //NOI18N - /** - * J2EE specification version 1.4 + /** + * J2EE specification version 1.4 * @since 1.5 + * @deprecated use {@link Profile#J2EE_14} */ public static final String J2EE_14 = "1.4"; //NOI18N /** - * + * * JAVA EE 5 specification version - * + * * @since 1.6 + * @deprecated use {@link Profile#JAVA_EE_5} */ - public static final String JAVA_EE_5 = "1.5"; // NOI18N + public static final String JAVA_EE_5 = "1.5"; // NOI18N public static final String APP_XML = "META-INF/application.xml"; public static final String WEB_XML = "WEB-INF/web.xml"; diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eePlatform.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eePlatform.java --- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eePlatform.java +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eePlatform.java @@ -59,6 +59,7 @@ import org.netbeans.api.java.platform.JavaPlatform; import org.netbeans.api.project.libraries.Library; import org.netbeans.api.project.libraries.LibraryManager; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.impl.ServerInstance; import org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformImpl; import org.netbeans.modules.j2ee.deployment.common.api.J2eeLibraryTypeProvider; @@ -71,7 +72,6 @@ import org.openide.util.ImageUtilities; import org.openide.util.Lookup; import org.openide.util.Parameters; -import org.openide.util.Utilities; /** @@ -390,6 +390,7 @@ * class. * * @return list of supported J2EE specification versions. + * @deprecated use {@link #getSupportedProfiles()} */ public Set/**/ getSupportedSpecVersions() { return impl.getSupportedSpecVersions(); @@ -402,11 +403,20 @@ * @param moduleType one of the constants defined in * {@link org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule} * @return list of supported J2EE specification versions. + * @deprecated use {@link #getSupportedProfiles(java.lang.Object)} */ public Set getSupportedSpecVersions(Object moduleType) { return impl.getSupportedSpecVersions(moduleType); } + public Set getSupportedProfiles() { + return impl.getSupportedProfiles(); + } + + public Set getSupportedProfiles(Object moduleType) { + return impl.getSupportedProfiles(moduleType); + } + /** * Return a list of supported J2EE module types. Use module types defined in the * {@link org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule} diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Profile.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Profile.java new file mode 100644 --- /dev/null +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Profile.java @@ -0,0 +1,130 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.j2ee.deployment.devmodules.api; + +import java.util.Comparator; +import org.openide.util.NbBundle; + +/** + * Represents the defined Java EE profiles. + * + * @author Petr Hejl + */ +public final class Profile implements Comparable { + + public static final Comparator REVERSE_COMPARATOR = new Comparator() { + + public int compare(Profile o1, Profile o2) { + return -(o1.compareTo(o2)); + } + }; + + public static final Profile J2EE_13 = new Profile(1, J2eeModule.J2EE_13, "J2EE13.displayName"); + + public static final Profile J2EE_14 = new Profile(2, J2eeModule.J2EE_14, "J2EE14.displayName"); + + public static final Profile JAVA_EE_5 = new Profile(3, J2eeModule.JAVA_EE_5, "JavaEE5.displayName"); + + public static final Profile JAVA_EE_6_FULL = new Profile(4, "EE_6_FULL", "JavaEE6Full.displayName"); + + public static final Profile JAVA_EE_6_WEB = new Profile(5, "EE_6_WEB", "JavaEE6Web.displayName"); + + private final int order; + + private final String name; + + private final String bundleKey; + + private Profile(int order, String name, String bundleKey) { + this.order = order; + this.name = name; + this.bundleKey = bundleKey; + } + + /** + * Returns the UI visible description of the profile. + * + * @return the UI visible description of the profile + */ + public String getDisplayName() { + return NbBundle.getMessage(Profile.class, bundleKey); + } + + public String toPropertiesString() { + return name; + } + + @Override + public String toString() { + return name; + } + + public int compareTo(Profile o) { + return this.order - o.order; + } + + public static Profile fromPropertiesString(String value) { + if (J2EE_13.toPropertiesString().equals(value)) { + return J2EE_13; + } else if (J2EE_14.toPropertiesString().equals(value)) { + return J2EE_14; + } else if (JAVA_EE_5.toPropertiesString().equals(value)) { + return JAVA_EE_5; + } else if (JAVA_EE_6_FULL.toPropertiesString().equals(value)) { + return JAVA_EE_6_FULL; + } else if (JAVA_EE_6_WEB.toPropertiesString().equals(value)) { + return JAVA_EE_6_WEB; + } else { + return null; + } + } + + public static Profile fromDeprecated(String value) { + if (J2eeModule.J2EE_13.equals(value)) { + return J2EE_13; + } else if (J2eeModule.J2EE_14.equals(value)) { + return J2EE_14; + } else if (J2eeModule.JAVA_EE_5.equals(value)) { + return JAVA_EE_5; + } + + return null; + } +} diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/spi/J2eePlatformImpl.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/spi/J2eePlatformImpl.java --- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/spi/J2eePlatformImpl.java +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/spi/J2eePlatformImpl.java @@ -46,8 +46,11 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.io.File; +import java.util.EnumSet; +import java.util.HashSet; import java.util.Set; import org.netbeans.api.java.platform.JavaPlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.spi.project.libraries.LibraryImplementation; import org.openide.util.Lookup; @@ -129,7 +132,7 @@ * * @return list of supported J2EE specification versions. */ - public abstract Set/**/ getSupportedSpecVersions(); + public abstract Set getSupportedSpecVersions(); /** * Return a list of supported J2EE specification versions for @@ -148,7 +151,29 @@ public Set getSupportedSpecVersions(Object moduleType) { return getSupportedSpecVersions(); } - + + public Set getSupportedProfiles() { + Set set = new HashSet(); + for (String spec : getSupportedSpecVersions()) { + Profile profile = Profile.fromDeprecated(spec); + if (profile != null) { + set.add(profile); + } + } + return set; + } + + public Set getSupportedProfiles(Object moduleType) { + Set set = new HashSet(); + for (String spec : getSupportedSpecVersions(moduleType)) { + Profile profile = Profile.fromDeprecated(spec); + if (profile != null) { + set.add(profile); + } + } + return set; + } + /** * Return a list of supported J2EE module types. Use module types defined in the * {@link org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule} diff --git a/web.project/nbproject/project.properties b/web.project/nbproject/project.properties --- a/web.project/nbproject/project.properties +++ b/web.project/nbproject/project.properties @@ -53,7 +53,7 @@ javac.compilerargs=-Xlint:unchecked javadoc.arch=${basedir}/arch.xml -spec.version.base=1.16.0 +spec.version.base=1.17.0 # needed for the TestUtil class test.unit.cp.extra= diff --git a/web.project/nbproject/project.xml b/web.project/nbproject/project.xml --- a/web.project/nbproject/project.xml +++ b/web.project/nbproject/project.xml @@ -148,7 +148,7 @@ 1 - 1.36 + 1.38 @@ -209,7 +209,7 @@ 4 - 1.54 + 1.58 diff --git a/web.project/src/org/netbeans/modules/web/project/Utils.java b/web.project/src/org/netbeans/modules/web/project/Utils.java --- a/web.project/src/org/netbeans/modules/web/project/Utils.java +++ b/web.project/src/org/netbeans/modules/web/project/Utils.java @@ -445,7 +445,7 @@ public static LibraryChooser.Filter getFilter(WebProject p) { LibraryChooser.Filter filter = null; WebModule wm = WebModule.getWebModule(p.getProjectDirectory()); - if (wm != null && "1.3".equals(wm.getJ2eePlatformVersion())) { // NOI18N + if (wm != null && WebModule.J2EE_13_LEVEL.equals(wm.getJ2eePlatformVersion())) { // NOI18N filter = new LibraryChooser.Filter() { public boolean accept(Library library) { if ("javascript".equals(library.getType())) { //NOI18N diff --git a/web.project/src/org/netbeans/modules/web/project/WebContainerImpl.java b/web.project/src/org/netbeans/modules/web/project/WebContainerImpl.java --- a/web.project/src/org/netbeans/modules/web/project/WebContainerImpl.java +++ b/web.project/src/org/netbeans/modules/web/project/WebContainerImpl.java @@ -76,6 +76,7 @@ import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata; import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel; import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction; +import org.netbeans.modules.web.api.webmodule.WebModule; import org.netbeans.modules.web.project.classpath.ClassPathProviderImpl; import org.netbeans.modules.web.spi.webmodule.WebModuleImplementation; import org.netbeans.spi.project.support.ant.AntProjectHelper; @@ -311,7 +312,7 @@ } private static boolean isDescriptorMandatory(String j2eeVersion) { - if ("1.3".equals(j2eeVersion) || "1.4".equals(j2eeVersion)) { + if (WebModule.J2EE_13_LEVEL.equals(j2eeVersion) || WebModule.J2EE_14_LEVEL.equals(j2eeVersion)) { return true; } return false; diff --git a/web.project/src/org/netbeans/modules/web/project/WebPersistenceProviderSupplier.java b/web.project/src/org/netbeans/modules/web/project/WebPersistenceProviderSupplier.java --- a/web.project/src/org/netbeans/modules/web/project/WebPersistenceProviderSupplier.java +++ b/web.project/src/org/netbeans/modules/web/project/WebPersistenceProviderSupplier.java @@ -45,6 +45,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Capabilities; import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; @@ -100,19 +101,7 @@ } public boolean supportsDefaultProvider() { - - J2eeModuleProvider j2eeModuleProvider = (J2eeModuleProvider) project.getLookup().lookup(J2eeModuleProvider.class); - J2eePlatform platform = Deployment.getDefault().getJ2eePlatform(j2eeModuleProvider.getServerInstanceID()); - - if (platform == null){ - // server probably not registered, can't resolve whether default provider is supported (see #79856) - return false; - } - - Set supportedVersions = platform.getSupportedSpecVersions(j2eeModuleProvider.getJ2eeModule().getModuleType()); - - return supportedVersions.contains(J2eeModule.JAVA_EE_5) - && platform.isToolSupported("defaultPersistenceProviderJavaEE5"); + return Capabilities.forProject(project).hasDefaultPersistenceProvider(); } diff --git a/web.project/src/org/netbeans/modules/web/project/api/WebProjectCreateData.java b/web.project/src/org/netbeans/modules/web/project/api/WebProjectCreateData.java --- a/web.project/src/org/netbeans/modules/web/project/api/WebProjectCreateData.java +++ b/web.project/src/org/netbeans/modules/web/project/api/WebProjectCreateData.java @@ -42,6 +42,7 @@ package org.netbeans.modules.web.project.api; import java.io.File; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.openide.filesystems.FileObject; /** @@ -50,13 +51,13 @@ * * @author Radko Najman */ -public class WebProjectCreateData { +public final class WebProjectCreateData { //common to create and import project private File projectDir; private String name; private String serverInstanceID; - private String javaEEVersion; + private Profile javaEEProfile; private String sourceLevel; private String javaPlatformName; private String serverLibraryName; @@ -133,20 +134,31 @@ this.serverInstanceID = serverInstanceID; } + public Profile getJavaEEProfile() { + return javaEEProfile; + } + + public void setJavaEEProfile(Profile javaEEProfile) { + this.javaEEProfile = javaEEProfile; + } + + /** * Gets Java EE version * @return Java EE version + * @deprecated */ public String getJavaEEVersion() { - return javaEEVersion; + return getJavaEEProfile().toPropertiesString(); } /** * Sets Java EE version * @param javaEEVersion Java EE version. Cannot be null. + * @deprecated */ public void setJavaEEVersion(String javaEEVersion) { - this.javaEEVersion = javaEEVersion; + setJavaEEProfile(Profile.fromPropertiesString(javaEEVersion)); } /** diff --git a/web.project/src/org/netbeans/modules/web/project/api/WebProjectUtilities.java b/web.project/src/org/netbeans/modules/web/project/api/WebProjectUtilities.java --- a/web.project/src/org/netbeans/modules/web/project/api/WebProjectUtilities.java +++ b/web.project/src/org/netbeans/modules/web/project/api/WebProjectUtilities.java @@ -54,7 +54,6 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.AntDeploymentHelper; import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; -import org.netbeans.modules.web.api.webmodule.WebModule; import org.netbeans.modules.web.project.*; import org.netbeans.modules.web.project.ui.customizer.WebProjectProperties; import org.netbeans.spi.project.support.ant.AntProjectHelper; @@ -92,6 +91,7 @@ import org.netbeans.modules.j2ee.dd.api.web.WebApp; import org.netbeans.modules.j2ee.dd.api.web.WelcomeFileList; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.java.api.common.ant.UpdateHelper; import org.netbeans.modules.java.api.common.project.ProjectProperties; import org.netbeans.modules.java.api.common.ui.PlatformUiSupport; @@ -188,7 +188,7 @@ String name = createData.getName(); String serverInstanceID = createData.getServerInstanceID(); String sourceStructure = createData.getSourceStructure(); - String j2eeLevel = createData.getJavaEEVersion(); + Profile j2eeProfile = createData.getJavaEEProfile(); String contextPath = createData.getContextPath(); String javaPlatformName = createData.getJavaPlatformName(); String sourceLevel = createData.getSourceLevel(); @@ -196,7 +196,7 @@ assert name != null: "Project name can't be null"; //NOI18N assert serverInstanceID != null: "Server instance ID can't be null"; //NOI18N assert sourceStructure != null: "Source structure can't be null"; //NOI18N - assert j2eeLevel != null: "Java EE version can't be null"; //NOI18N + assert j2eeProfile != null: "Java EE version can't be null"; //NOI18N final boolean createBluePrintsStruct = SRC_STRUCT_BLUEPRINTS.equals(sourceStructure); final boolean createJakartaStructure = SRC_STRUCT_JAKARTA.equals(sourceStructure); @@ -205,7 +205,7 @@ serverInstanceID, projectDir, createData.getServerLibraryName() != null); final AntProjectHelper h = setupProject(projectDir, name, serverInstanceID, - j2eeLevel, createData.getLibrariesDefinition(), serverLibraryName); + j2eeProfile, createData.getLibrariesDefinition(), serverLibraryName); FileObject srcFO = projectDir.createFolder(DEFAULT_SRC_FOLDER); FileObject confFolderFO = null; @@ -241,22 +241,25 @@ // create web.xml // PENDING : should be easier to define in layer and copy related FileObject (doesn't require systemClassLoader) String webXMLContent = null; - if (J2eeModule.JAVA_EE_5.equals(j2eeLevel)) + if (Profile.JAVA_EE_5 == j2eeProfile) { webXMLContent = readResource(Thread.currentThread().getContextClassLoader().getResourceAsStream(RESOURCE_FOLDER + "web-2.5.xml")); //NOI18N - else if (WebModule.J2EE_14_LEVEL.equals(j2eeLevel)) + } else if (Profile.J2EE_14 == j2eeProfile) { webXMLContent = readResource(Thread.currentThread().getContextClassLoader().getResourceAsStream(RESOURCE_FOLDER + "web-2.4.xml")); //NOI18N - else if (WebModule.J2EE_13_LEVEL.equals(j2eeLevel)) + } else if (Profile.J2EE_13 == j2eeProfile) { webXMLContent = readResource(Thread.currentThread().getContextClassLoader().getResourceAsStream(RESOURCE_FOLDER + "web-2.3.xml")); //NOI18N - assert webXMLContent != null : "Cannot find web.xml template for J2EE specification level:" + j2eeLevel; - final String webXmlText = webXMLContent; - FileObject webXML = FileUtil.createData(webInfFO, "web.xml");//NOI18N - FileLock lock = webXML.lock(); - BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(webXML.getOutputStream(lock))); - try { - bw.write(webXmlText); - } finally { - bw.close(); - lock.releaseLock(); + } + // FIXME JAVA_EE_6 + if (webXMLContent != null) { + final String webXmlText = webXMLContent; + FileObject webXML = FileUtil.createData(webInfFO, "web.xml");//NOI18N + FileLock lock = webXML.lock(); + BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(webXML.getOutputStream(lock))); + try { + bw.write(webXmlText); + } finally { + bw.close(); + lock.releaseLock(); + } } EditableProperties ep = h.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); @@ -454,7 +457,7 @@ File[] tstFolders = createData.getTestFolders(); FileObject docBase = createData.getDocBase(); FileObject libFolder = createData.getLibFolder(); - String j2eeLevel = createData.getJavaEEVersion(); + Profile j2eeProfile = createData.getJavaEEProfile(); String serverInstanceID = createData.getServerInstanceID(); String buildfile = createData.getBuildfile(); String javaPlatformName = createData.getJavaPlatformName(); @@ -467,13 +470,13 @@ assert sourceFolders != null: "Source package root can't be null"; //NOI18N assert docBase != null: "Web Pages folder can't be null"; //NOI18N assert serverInstanceID != null: "Server instance ID can't be null"; //NOI18N - assert j2eeLevel != null: "Java EE version can't be null"; //NOI18N + assert j2eeProfile != null: "Java EE version can't be null"; //NOI18N final String serverLibraryName = configureServerLibrary(createData.getLibrariesDefinition(), serverInstanceID, projectDir, createData.getServerLibraryName() != null); final AntProjectHelper antProjectHelper = setupProject(projectDir, name, - serverInstanceID, j2eeLevel, createData.getLibrariesDefinition(), serverLibraryName); + serverInstanceID, j2eeProfile, createData.getLibrariesDefinition(), serverLibraryName); final WebProject p = (WebProject) ProjectManager.getDefault().findProject(antProjectHelper.getProjectDirectory()); final ReferenceHelper referenceHelper = p.getReferenceHelper(); @@ -690,7 +693,7 @@ } private static AntProjectHelper setupProject(FileObject dirFO, String name, - String serverInstanceID, String j2eeLevel, String librariesDefinition, String serverLibraryName) throws IOException { + String serverInstanceID, Profile j2eeProfile, String librariesDefinition, String serverLibraryName) throws IOException { Utils.logUI(NbBundle.getBundle(WebProjectUtilities.class), "UI_WEB_PROJECT_CREATE_SHARABILITY", // NOI18N new Object[]{Boolean.valueOf(librariesDefinition != null), Boolean.valueOf(serverLibraryName != null)}); @@ -733,7 +736,7 @@ ep.setProperty(WebProjectProperties.JSPCOMPILATION_CLASSPATH, "${jspc.classpath}:${javac.classpath}"); - ep.setProperty(WebProjectProperties.J2EE_PLATFORM, j2eeLevel); + ep.setProperty(WebProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); ep.setProperty(WebProjectProperties.WAR_NAME, PropertyUtils.getUsablePropertyName(name) + ".war"); // NOI18N //XXX the name of the dist.ear.jar file should be different, but now it cannot be since the name is used as a key in module provider mapping @@ -825,9 +828,9 @@ // set j2ee.platform.classpath J2eePlatform j2eePlatform = Deployment.getDefault().getJ2eePlatform(serverInstanceID); - if (!j2eePlatform.getSupportedSpecVersions(J2eeModule.WAR).contains(j2eeLevel)) { + if (!j2eePlatform.getSupportedProfiles(J2eeModule.WAR).contains(j2eeProfile)) { Logger.getLogger("global").log(Level.WARNING, - "J2EE level:" + j2eeLevel + " not supported by server " + Deployment.getDefault().getServerInstanceDisplayName(serverInstanceID) + " for module type WAR"); // NOI18N + "J2EE level:" + j2eeProfile.getDisplayName() + " not supported by server " + Deployment.getDefault().getServerInstanceDisplayName(serverInstanceID) + " for module type WAR"); // NOI18N } if (!h.isSharableProject() || serverLibraryName == null) { diff --git a/web.project/src/org/netbeans/modules/web/project/ui/WebLogicalViewProvider.java b/web.project/src/org/netbeans/modules/web/project/ui/WebLogicalViewProvider.java --- a/web.project/src/org/netbeans/modules/web/project/ui/WebLogicalViewProvider.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/WebLogicalViewProvider.java @@ -97,6 +97,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; import org.netbeans.modules.java.api.common.SourceRoots; @@ -535,16 +536,16 @@ } public void actionPerformed(ActionEvent e) { - String j2eeSpec = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH). - getProperty(WebProjectProperties.J2EE_PLATFORM); - if (j2eeSpec == null) { - j2eeSpec = J2EEProjectProperties.JAVA_EE_5; // NOI18N + Profile j2eeProfile = Profile.fromPropertiesString(helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH). + getProperty(WebProjectProperties.J2EE_PLATFORM)); + if (j2eeProfile == null) { + j2eeProfile = Profile.JAVA_EE_5; // NOI18N Logger.getLogger(WebLogicalViewProvider.class.getName()).warning( "project ["+project.getProjectDirectory()+"] is missing "+WebProjectProperties.J2EE_PLATFORM+". " + // NOI18N - "default value will be used instead: "+j2eeSpec); // NOI18N - updateJ2EESpec(project, project.getAntProjectHelper(), j2eeSpec); + "default value will be used instead: "+j2eeProfile); // NOI18N + updateJ2EESpec(project, project.getAntProjectHelper(), j2eeProfile); } - String instance = BrokenServerSupport.selectServer(j2eeSpec, J2eeModule.WAR); + String instance = BrokenServerSupport.selectServer(j2eeProfile, J2eeModule.WAR); if (instance != null) { WebProjectProperties.setServerInstance( project, helper, instance); @@ -552,12 +553,12 @@ checkMissingServer(); } - private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final String j2eeSpec) { + private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final Profile j2eeProfile) { ProjectManager.mutex().postWriteRequest(new Runnable() { public void run() { try { EditableProperties projectProps = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); - projectProps.put(WebProjectProperties.J2EE_PLATFORM, j2eeSpec); + projectProps.put(WebProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); helper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, projectProps); ProjectManager.getDefault().saveProject(project); } catch (IOException e) { diff --git a/web.project/src/org/netbeans/modules/web/project/ui/customizer/Bundle.properties b/web.project/src/org/netbeans/modules/web/project/ui/customizer/Bundle.properties --- a/web.project/src/org/netbeans/modules/web/project/ui/customizer/Bundle.properties +++ b/web.project/src/org/netbeans/modules/web/project/ui/customizer/Bundle.properties @@ -243,10 +243,6 @@ LBL_RelativeURLExample=(e.g. /admin/login.jsp) -JavaEESpecLevel_50=Java EE 5 -J2EESpecLevel_14=J2EE 1.4 -J2EESpecLevel_13=J2EE 1.3 - Label_JVM_Argument=&VM Options: Label_VM_Hint=(used for running main classes or unit tests; e.g. -Xms10m) ACSN_CustomizerRun_NA=N/A diff --git a/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerFrameworks.java b/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerFrameworks.java --- a/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerFrameworks.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerFrameworks.java @@ -52,6 +52,8 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.ListSelectionListener; +import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.web.api.webmodule.ExtenderController; import org.netbeans.modules.web.api.webmodule.ExtenderController.Properties; import org.netbeans.modules.web.spi.webmodule.WebModuleExtender; @@ -110,10 +112,12 @@ return; } initialized = true; - String j2eeVersion = uiProperties.getProject().evaluator().getProperty(WebProjectProperties.J2EE_PLATFORM); + Profile j2eeProfile = Profile.fromPropertiesString(uiProperties.getProject().evaluator().getProperty(WebProjectProperties.J2EE_PLATFORM)); String serverInstanceID = uiProperties.getProject().evaluator().getProperty(WebProjectProperties.J2EE_SERVER_INSTANCE); Properties properties = controller.getProperties(); - properties.setProperty("j2eeLevel", j2eeVersion); // NOI18N + + // FIXME I left string here for compatibility reasons (frameworks) + properties.setProperty(ProjectServerWizardPanel.J2EE_LEVEL, j2eeProfile.toPropertiesString()); // NOI18N properties.setProperty("serverInstanceID", serverInstanceID); // NOI18N jListFrameworks.setModel(new DefaultListModel()); diff --git a/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerRun.java b/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerRun.java --- a/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerRun.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerRun.java @@ -54,6 +54,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.api.ServerInstance; import org.netbeans.modules.java.api.common.ant.UpdateHelper; import org.openide.util.HelpCtx; @@ -102,13 +103,10 @@ jCheckBoxDeployOnSave.setModel(uiProperties.DEPLOY_ON_SAVE_MODEL); jComboBoxServer.setModel( uiProperties.J2EE_SERVER_INSTANCE_MODEL ); - String j2eeVersion = jTextFieldJ2EE.getText().trim(); - if (j2eeVersion.equalsIgnoreCase(WebModule.J2EE_13_LEVEL)) - jTextFieldJ2EE_Display.setText(NbBundle.getMessage(CustomizerRun.class, "J2EESpecLevel_13")); //NOI18N; - else if (j2eeVersion.equalsIgnoreCase(WebModule.J2EE_14_LEVEL)) - jTextFieldJ2EE_Display.setText(NbBundle.getMessage(CustomizerRun.class, "J2EESpecLevel_14")); //NOI18N; - else if (j2eeVersion.equalsIgnoreCase(WebModule.JAVA_EE_5_LEVEL)) - jTextFieldJ2EE_Display.setText(NbBundle.getMessage(CustomizerRun.class, "JavaEESpecLevel_50")); //NOI18N; + Profile j2eeProfile = Profile.fromPropertiesString(jTextFieldJ2EE.getText().trim()); + if (j2eeProfile != null) { + jTextFieldJ2EE_Display.setText(j2eeProfile.getDisplayName()); + } setDeployOnSaveState(); } diff --git a/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java b/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java --- a/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java @@ -119,9 +119,6 @@ */ final public class WebProjectProperties { - public static final String J2EE_1_4 = "1.4"; // NOI18N - public static final String J2EE_1_3 = "1.3"; // NOI18N - // Special properties of the project public static final String WEB_PROJECT_NAME = "web.project.name"; //NOI18N public static final String JAVA_PLATFORM = "platform.active"; //NOI18N diff --git a/web.project/src/org/netbeans/modules/web/project/ui/wizards/ImportWebProjectWizardIterator.java b/web.project/src/org/netbeans/modules/web/project/ui/wizards/ImportWebProjectWizardIterator.java --- a/web.project/src/org/netbeans/modules/web/project/ui/wizards/ImportWebProjectWizardIterator.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/wizards/ImportWebProjectWizardIterator.java @@ -76,6 +76,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.web.project.Utils; import org.netbeans.spi.project.ui.support.ProjectChooser; @@ -140,7 +141,7 @@ File[] testFolders = (File[]) wiz.getProperty(WizardProperties.TEST_ROOT); String libName = (String) wiz.getProperty(WizardProperties.LIB_FOLDER); String serverInstanceID = (String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID); - String j2eeLevel = (String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); + Profile j2eeProfile = (Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); String webInfFolder = (String) wiz.getProperty(WizardProperties.WEBINF_FOLDER); FileObject wmFO = FileUtil.toFileObject (dirSrcF); @@ -171,8 +172,8 @@ libFolder = FileUtil.toFileObject(f); } - if(j2eeLevel == null) { - j2eeLevel = WebModule.J2EE_14_LEVEL; + if(j2eeProfile == null) { + j2eeProfile = Profile.J2EE_14; } String buildfile = projectLocationWizardPanel.getBuildFile(); @@ -185,7 +186,7 @@ createData.setTestFolders(testFolders); createData.setDocBase(docBase); createData.setLibFolder(libFolder); - createData.setJavaEEVersion(j2eeLevel); + createData.setJavaEEProfile(j2eeProfile); createData.setServerInstanceID(serverInstanceID); createData.setBuildfile(buildfile); createData.setJavaPlatformName((String) wiz.getProperty(ProjectServerWizardPanel.JAVA_PLATFORM)); diff --git a/web.project/src/org/netbeans/modules/web/project/ui/wizards/NewWebProjectWizardIterator.java b/web.project/src/org/netbeans/modules/web/project/ui/wizards/NewWebProjectWizardIterator.java --- a/web.project/src/org/netbeans/modules/web/project/ui/wizards/NewWebProjectWizardIterator.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/wizards/NewWebProjectWizardIterator.java @@ -78,6 +78,7 @@ import org.netbeans.modules.j2ee.common.project.ui.UserProjectSettings; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.web.project.Utils; import org.netbeans.spi.java.project.support.ui.SharableLibrariesUtils; @@ -137,7 +138,7 @@ if (createData.getSourceStructure() == null) { createData.setSourceStructure(WebProjectUtilities.SRC_STRUCT_BLUEPRINTS); } - createData.setJavaEEVersion((String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL)); + createData.setJavaEEProfile((Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL)); createData.setContextPath((String) wiz.getProperty(ProjectServerWizardPanel.CONTEXT_PATH)); createData.setJavaPlatformName((String) wiz.getProperty(ProjectServerWizardPanel.JAVA_PLATFORM)); createData.setSourceLevel((String) wiz.getProperty(ProjectServerWizardPanel.SOURCE_LEVEL)); diff --git a/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSourceFolders.java b/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSourceFolders.java --- a/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSourceFolders.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSourceFolders.java @@ -57,6 +57,7 @@ import org.netbeans.modules.j2ee.common.project.ui.ProjectLocationWizardPanel; import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.web.project.ProjectWebModule; import org.openide.DialogDisplayer; import org.openide.NotifyDescriptor; @@ -237,8 +238,8 @@ //rather setting to null that refreshing filesystem from a performance reason if (webXml != null && !webXml.isValid()) webXml = null; - String j2eeLevel = (String) wizardDescriptor.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); - if (webXml == null && (j2eeLevel.equals(J2eeModule.J2EE_13) || j2eeLevel.equals(J2eeModule.J2EE_14))) + Profile j2eeProfile = (Profile) wizardDescriptor.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); + if (webXml == null && (j2eeProfile == Profile.J2EE_13 || j2eeProfile == Profile.J2EE_14)) return NbBundle.getMessage(PanelSourceFolders.class, "MSG_FileNotFound", webInf.getPath()); //NOI18N for (int i=0; i + diff --git a/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSupportedFrameworksVisual.java b/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSupportedFrameworksVisual.java --- a/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSupportedFrameworksVisual.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSupportedFrameworksVisual.java @@ -61,6 +61,8 @@ import javax.swing.table.AbstractTableModel; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellRenderer; +import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.web.api.webmodule.ExtenderController; import org.netbeans.modules.web.api.webmodule.ExtenderController.Properties; import org.netbeans.modules.web.spi.webmodule.WebModuleExtender; @@ -284,7 +286,9 @@ void read(WizardDescriptor settings) { Properties properties = controller.getProperties(); properties.setProperty("name", (String) settings.getProperty("name")); // NOI18N - properties.setProperty("j2eeLevel", (String) settings.getProperty("j2eeLevel")); // NOI18N + + // FIXME I left string here for compatibility reasons (frameworks) + properties.setProperty(ProjectServerWizardPanel.J2EE_LEVEL, ((Profile) settings.getProperty(ProjectServerWizardPanel.J2EE_LEVEL)).toPropertiesString()); // NOI18N properties.setProperty("serverInstanceID", (String) settings.getProperty("serverInstanceID")); // NOI18N properties.setProperty("setSourceLevel", (String) settings.getProperty("setSourceLevel")); // NOI18N # HG changeset patch # User phejl@netbeans.org # Date 1244034926 -7200 # Node ID b55e03b6486f1d868f787d852928686e4201b705 # Parent 5ae5c863ede48e408fe75b1baa65311cff6da9b2 # Parent 986a89bb099ef36625f38070be90f19f162aaaf8 Automated merge with http://hg.netbeans.org/web-main diff --git a/j2ee.clientproject/nbproject/project.properties b/j2ee.clientproject/nbproject/project.properties --- a/j2ee.clientproject/nbproject/project.properties +++ b/j2ee.clientproject/nbproject/project.properties @@ -38,7 +38,7 @@ # made subject to such option by the copyright holder. javac.compilerargs=-Xlint:unchecked -spec.version.base=1.10.0 +spec.version.base=1.11.0 javadoc.arch=${basedir}/arch.xml javadoc.preview=true javac.source=1.5 diff --git a/j2ee.clientproject/nbproject/project.xml b/j2ee.clientproject/nbproject/project.xml --- a/j2ee.clientproject/nbproject/project.xml +++ b/j2ee.clientproject/nbproject/project.xml @@ -135,7 +135,7 @@ 1 - 1.36 + 1.38 @@ -179,7 +179,7 @@ 4 - 1.42 + 1.58 diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientInjectionTargetQueryImplementation.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientInjectionTargetQueryImplementation.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientInjectionTargetQueryImplementation.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientInjectionTargetQueryImplementation.java @@ -45,6 +45,7 @@ import org.netbeans.api.java.source.CompilationController; import org.netbeans.api.java.source.SourceUtils; import org.netbeans.modules.j2ee.api.ejbjar.Car; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation; /** @@ -60,8 +61,8 @@ public boolean isInjectionTarget(CompilationController controller, TypeElement typeElement) { Car apiCar = Car.getCar(controller.getFileObject()); if (apiCar != null && - !apiCar.getJ2eePlatformVersion().equals("1.3") && - !apiCar.getJ2eePlatformVersion().equals("1.4")) { + !apiCar.getJ2eePlatformVersion().equals(EjbProjectConstants.J2EE_13_LEVEL) && + !apiCar.getJ2eePlatformVersion().equals(EjbProjectConstants.J2EE_14_LEVEL)) { return SourceUtils.isMainClass(typeElement.getQualifiedName().toString(), controller.getClasspathInfo()); } return false; diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProvider.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProvider.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProvider.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProvider.java @@ -61,6 +61,7 @@ import org.netbeans.api.project.SourceGroup; import org.netbeans.api.project.Sources; import org.netbeans.api.project.ui.OpenProjects; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.clientproject.ui.customizer.AppClientProjectProperties; import org.netbeans.modules.java.api.common.classpath.ClassPathProviderImpl; import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties; @@ -145,8 +146,8 @@ /** Package-private for unit test only. */ static boolean needConfigurationFolder(final String version) { - return J2EEProjectProperties.J2EE_1_3.equals(version) || - J2EEProjectProperties.J2EE_1_4.equals(version); + return EjbProjectConstants.J2EE_13_LEVEL.equals(version) || + EjbProjectConstants.J2EE_13_LEVEL.equals(version); } public File getMetaInfAsFile() { diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java @@ -55,6 +55,7 @@ import org.netbeans.api.project.ProjectManager; import org.netbeans.api.project.ant.AntArtifact; import org.netbeans.api.project.ant.AntArtifactQuery; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.api.ejbjar.EjbReference; import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer; import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceSupport; @@ -288,7 +289,7 @@ } private static boolean isDescriptorMandatory(String j2eeVersion) { - if ("1.3".equals(j2eeVersion) || "1.4".equals(j2eeVersion)) { + if (EjbProjectConstants.J2EE_13_LEVEL.equals(j2eeVersion) || EjbProjectConstants.J2EE_14_LEVEL.equals(j2eeVersion)) { return true; } return false; diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectCreateData.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectCreateData.java new file mode 100644 --- /dev/null +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectCreateData.java @@ -0,0 +1,164 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.j2ee.clientproject.api; + +import java.io.File; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; + +/** + * + * @author Petr Hejl + */ +public final class AppClientProjectCreateData { + + private File projectDir; + + private String name; + + private String mainClass; + + private Profile javaEEProfile; + + private String serverInstanceID; + + private String librariesDefinition; + + private String serverLibraryName; + + private File[] sourceFolders; + + private File[] testFolders; + + private File confFolder; + + private File libFolder; + + public AppClientProjectCreateData() { + } + + public Profile getJavaEEProfile() { + return javaEEProfile; + } + + public void setJavaEEProfile(Profile javaEEProfile) { + this.javaEEProfile = javaEEProfile; + } + + public String getLibrariesDefinition() { + return librariesDefinition; + } + + public void setLibrariesDefinition(String librariesDefinition) { + this.librariesDefinition = librariesDefinition; + } + + public String getMainClass() { + return mainClass; + } + + public void setMainClass(String mainClass) { + this.mainClass = mainClass; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public File getProjectDir() { + return projectDir; + } + + public void setProjectDir(File projectDir) { + this.projectDir = projectDir; + } + + public String getServerInstanceID() { + return serverInstanceID; + } + + public void setServerInstanceID(String serverInstanceID) { + this.serverInstanceID = serverInstanceID; + } + + public String getServerLibraryName() { + return serverLibraryName; + } + + public void setServerLibraryName(String serverLibraryName) { + this.serverLibraryName = serverLibraryName; + } + + public File getConfFolder() { + return confFolder; + } + + public void setConfFolder(File confFolder) { + this.confFolder = confFolder; + } + + public File getLibFolder() { + return libFolder; + } + + public void setLibFolder(File libFolder) { + this.libFolder = libFolder; + } + + public File[] getSourceFolders() { + return sourceFolders; + } + + public void setSourceFolders(File[] sourceFolders) { + this.sourceFolders = sourceFolders; + } + + public File[] getTestFolders() { + return testFolders; + } + + public void setTestFolders(File[] testFolders) { + this.testFolders = testFolders; + } + +} diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java @@ -68,6 +68,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.java.api.common.ant.UpdateHelper; import org.netbeans.modules.java.api.common.project.ProjectProperties; import org.netbeans.modules.java.api.common.ui.PlatformUiSupport; @@ -123,34 +124,53 @@ * @return the helper object permitting it to be further customized * @throws IOException in case something went wrong */ + @Deprecated public static AntProjectHelper createProject(File dir, final String name, final String mainClass, final String j2eeLevel, final String serverInstanceID) throws IOException { return createProject(dir, name, mainClass, j2eeLevel, serverInstanceID, null, null); } - + + @Deprecated public static AntProjectHelper createProject(File dir, final String name, final String mainClass, final String j2eeLevel, final String serverInstanceID, final String librariesDefinition, final String serverLibraryName) throws IOException { - + + AppClientProjectCreateData createData = new AppClientProjectCreateData(); + createData.setProjectDir(dir); + createData.setName(name); + createData.setMainClass(mainClass); + createData.setJavaEEProfile(Profile.fromPropertiesString(j2eeLevel)); + createData.setServerInstanceID(serverInstanceID); + createData.setLibrariesDefinition(librariesDefinition); + createData.setServerLibraryName(serverLibraryName); + return createProject(createData); + } + + public static AntProjectHelper createProject(final AppClientProjectCreateData createData) throws IOException { + File dir = createData.getProjectDir(); + final AntProjectHelper[] h = new AntProjectHelper[1]; final FileObject projectDir = FileUtil.createFolder(dir); - + // create project in one FS atomic action: FileSystem fs = projectDir.getFileSystem(); fs.runAtomicAction(new FileSystem.AtomicAction() { public void run() throws IOException { - AntProjectHelper helper = createProjectImpl(projectDir, name, - mainClass, j2eeLevel, serverInstanceID, librariesDefinition, serverLibraryName); + AntProjectHelper helper = createProjectImpl(createData, projectDir); h[0] = helper; }}); return h[0]; } - - private static AntProjectHelper createProjectImpl(FileObject projectDir, - String name, String mainClass, String j2eeLevel, final String serverInstanceID, - final String librariesDefinition, final String serverLibraryName) throws IOException { + + private static AntProjectHelper createProjectImpl(final AppClientProjectCreateData createData, + final FileObject projectDir) throws IOException { + + String name = createData.getName(); + String mainClass = createData.getMainClass(); + String serverInstanceID = createData.getServerInstanceID(); + Profile j2eeProfile = createData.getJavaEEProfile(); FileObject srcRoot = projectDir.createFolder(DEFAULT_SRC_FOLDER); FileObject javaRoot = srcRoot.createFolder(DEFAULT_JAVA_FOLDER); @@ -159,9 +179,9 @@ // create application-client.xml String resource; - if (J2eeModule.JAVA_EE_5.equals(j2eeLevel)) { + if (Profile.JAVA_EE_5.equals(j2eeProfile)) { resource = "org-netbeans-modules-j2ee-clientproject/application-client-5.xml"; // NOI18N - } else if (J2eeModule.J2EE_14.equals(j2eeLevel)) { + } else if (Profile.J2EE_14.equals(j2eeProfile)) { resource = "org-netbeans-modules-j2ee-clientproject/application-client-1.4.xml"; // NOI18N } else { resource = "org-netbeans-modules-j2ee-clientproject/application-client-1.3.xml"; // NOI18N @@ -171,13 +191,13 @@ appClient.setDisplayName(name); appClient.write(ddFile); - final String realServerLibraryName = configureServerLibrary(librariesDefinition, - serverInstanceID, projectDir, serverLibraryName != null); + final String realServerLibraryName = configureServerLibrary(createData.getLibrariesDefinition(), + serverInstanceID, projectDir, createData.getServerLibraryName() != null); final AntProjectHelper h = setupProject(projectDir, name, DEFAULT_SRC_FOLDER, DEFAULT_TEST_FOLDER, - null, null, null, mainClass, j2eeLevel, - serverInstanceID, librariesDefinition, realServerLibraryName); + null, null, null, mainClass, j2eeProfile, + serverInstanceID, createData.getLibrariesDefinition(), realServerLibraryName); EditableProperties ep = h.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); ep.put(AppClientProjectProperties.SOURCE_ROOT, DEFAULT_SRC_FOLDER); //NOI18N @@ -193,7 +213,7 @@ try { ProjectManager.mutex().writeAccess(new Mutex.ExceptionAction() { public Void run() throws Exception { - copyRequiredLibraries(h, refHelper, serverInstanceID, serverLibraryName); + copyRequiredLibraries(h, refHelper, createData); return null; } }); @@ -225,6 +245,7 @@ * @return the helper object permitting it to be further customized * @throws IOException in case something went wrong */ + @Deprecated public static AntProjectHelper importProject(final File dir, final String name, final File[] sourceFolders, final File[] testFolders, final File confFolder, final File libFolder, final String j2eeLevel, final String serverInstanceID) throws IOException { @@ -232,36 +253,59 @@ return importProject(dir, name, sourceFolders, testFolders, confFolder, libFolder, j2eeLevel, serverInstanceID, null, null); } - + + @Deprecated public static AntProjectHelper importProject(final File dir, final String name, final File[] sourceFolders, final File[] testFolders, final File confFolder, final File libFolder, final String j2eeLevel, final String serverInstanceID, final String librariesDefinition, final String serverLibraryName) throws IOException { + + AppClientProjectCreateData createData = new AppClientProjectCreateData(); + createData.setProjectDir(dir); + createData.setName(name); + createData.setSourceFolders(sourceFolders); + createData.setTestFolders(testFolders); + createData.setConfFolder(confFolder); + createData.setLibFolder(libFolder); + createData.setJavaEEProfile(Profile.fromPropertiesString(j2eeLevel)); + createData.setServerInstanceID(serverInstanceID); + createData.setLibrariesDefinition(librariesDefinition); + createData.setServerLibraryName(serverLibraryName); + return importProject(createData); + } + + public static AntProjectHelper importProject(final AppClientProjectCreateData createData) throws IOException { + File dir = createData.getProjectDir(); + final AntProjectHelper[] h = new AntProjectHelper[1]; final FileObject projectDir = FileUtil.createFolder(dir); - + // create project in one FS atomic action: FileSystem fs = projectDir.getFileSystem(); fs.runAtomicAction(new FileSystem.AtomicAction() { public void run() throws IOException { - AntProjectHelper helper = importProjectImpl(projectDir, name, sourceFolders, - testFolders, confFolder, libFolder, j2eeLevel, serverInstanceID, librariesDefinition, serverLibraryName); + AntProjectHelper helper = importProjectImpl(createData, projectDir); h[0] = helper; }}); return h[0]; } - private static AntProjectHelper importProjectImpl(final FileObject projectDir, final String name, - final File[] sourceFolders, final File[] testFolders, final File confFolder, - final File libFolder, String j2eeLevel, final String serverInstanceID, String librariesDefinition, final String serverLibraryName) throws IOException { + private static AntProjectHelper importProjectImpl(final AppClientProjectCreateData createData, final FileObject projectDir) throws IOException { + final File[] sourceFolders = createData.getSourceFolders(); + final File[] testFolders = createData.getTestFolders(); + String name = createData.getName(); + String serverInstanceID = createData.getServerInstanceID(); + File confFolder = createData.getConfFolder(); + Profile j2eeProfile = createData.getJavaEEProfile(); + assert sourceFolders != null && testFolders != null: "Package roots can't be null"; //NOI18N - final String realServerLibraryName = configureServerLibrary(librariesDefinition, - serverInstanceID, projectDir, serverLibraryName != null); + final String realServerLibraryName = configureServerLibrary(createData.getLibrariesDefinition(), + serverInstanceID, projectDir, createData.getServerLibraryName() != null); final AntProjectHelper h = setupProject(projectDir, name, null, null, - confFolder, (libFolder == null ? null : libFolder), - null, null, j2eeLevel, serverInstanceID, librariesDefinition, realServerLibraryName); + confFolder, createData.getLibFolder(), + null, null, j2eeProfile, serverInstanceID, createData.getLibrariesDefinition(), realServerLibraryName); final AppClientProject p = (AppClientProject) ProjectManager.getDefault().findProject(projectDir); final ReferenceHelper refHelper = p.getReferenceHelper(); @@ -308,7 +352,7 @@ } } h.putPrimaryConfigurationData(data,true); - copyRequiredLibraries(h, refHelper, serverInstanceID, serverLibraryName); + copyRequiredLibraries(h, refHelper, createData); ProjectManager.getDefault().saveProject(p); return null; } @@ -328,7 +372,7 @@ //AppClient root = DDProvider.getDefault().getDDRoot(Car.getCar(appClientXML)); AppClient root = DDProvider.getDefault().getDDRoot(appClientXML); boolean writeDD = false; - if (new BigDecimal(AppClient.VERSION_1_3).equals(root.getVersion()) && J2eeModule.J2EE_14.equals(j2eeLevel)) { // NOI18N + if (new BigDecimal(AppClient.VERSION_1_3).equals(root.getVersion()) && Profile.J2EE_14.equals(j2eeProfile)) { // NOI18N root.setVersion(new BigDecimal(AppClient.VERSION_1_4)); writeDD = true; } @@ -347,9 +391,9 @@ } else { // XXX just temporary, since now the import would fail due to another bug String resource; - if (J2eeModule.JAVA_EE_5.equals(j2eeLevel)) { + if (Profile.JAVA_EE_5.equals(j2eeProfile)) { resource = "org-netbeans-modules-j2ee-clientproject/application-client-5.xml"; // NOI18N - } else if (J2eeModule.J2EE_14.equals(j2eeLevel)) { + } else if (Profile.J2EE_14.equals(j2eeProfile)) { resource = "org-netbeans-modules-j2ee-clientproject/application-client-1.4.xml"; // NOI18N } else { resource = "org-netbeans-modules-j2ee-clientproject/application-client-1.3.xml"; // NOI18N @@ -362,7 +406,7 @@ } private static void copyRequiredLibraries(AntProjectHelper h, ReferenceHelper rh, - String serverInstanceId, String serverlibraryName) throws IOException { + AppClientProjectCreateData createData) throws IOException { if (!h.isSharableProject()) { return; @@ -427,7 +471,7 @@ private static AntProjectHelper setupProject(FileObject dirFO, String name, String srcRoot, String testRoot, File configFiles, File libraries, - String resources, String mainClass, String j2eeLevel, + String resources, String mainClass, Profile j2eeProfile, String serverInstanceID, String librariesDefinition, String serverLibraryName) throws IOException { Utils.logUI(NbBundle.getBundle(AppClientProjectGenerator.class), "UI_APP_PROJECT_CREATE_SHARABILITY", // NOI18N @@ -573,14 +617,14 @@ Deployment deployment = Deployment.getDefault(); J2eePlatform j2eePlatform = Deployment.getDefault().getJ2eePlatform(serverInstanceID); - if (!j2eePlatform.getSupportedSpecVersions(J2eeModule.CLIENT).contains(j2eeLevel)) { + if (!j2eePlatform.getSupportedProfiles(J2eeModule.CLIENT).contains(j2eeProfile)) { Logger.getLogger("global").log(Level.WARNING, NbBundle.getMessage(AppClientProjectGenerator.class, "MSG_Warning_SpecLevelNotSupported", - new Object[] {j2eeLevel, Deployment.getDefault().getServerInstanceDisplayName(serverInstanceID)})); + new Object[] {j2eeProfile, Deployment.getDefault().getServerInstanceDisplayName(serverInstanceID)})); } ep.setProperty(AppClientProjectProperties.J2EE_SERVER_TYPE, deployment.getServerID(serverInstanceID)); - ep.setProperty(AppClientProjectProperties.J2EE_PLATFORM, j2eeLevel); + ep.setProperty(AppClientProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); ep.setProperty("manifest.file", "${" +AppClientProjectProperties.META_INF + "}/" + MANIFEST_FILE); // NOI18N if (h.isSharableProject() && serverLibraryName != null) { diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java @@ -70,6 +70,7 @@ import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties; import org.netbeans.modules.j2ee.common.ui.BrokenServerSupport; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; import org.netbeans.modules.java.api.common.SourceRoots; @@ -474,15 +475,15 @@ } public void actionPerformed(ActionEvent e) { - String j2eeSpec = project.evaluator().getProperty(AppClientProjectProperties.J2EE_PLATFORM); - if (j2eeSpec == null) { - j2eeSpec = J2EEProjectProperties.JAVA_EE_5; // NOI18N + Profile j2eeProfile = Profile.fromPropertiesString(project.evaluator().getProperty(AppClientProjectProperties.J2EE_PLATFORM)); + if (j2eeProfile == null) { + j2eeProfile = Profile.JAVA_EE_5; Logger.getLogger(AppClientLogicalViewProvider.class.getName()).warning( "project ["+project.getProjectDirectory()+"] is missing "+AppClientProjectProperties.J2EE_PLATFORM+". " + // NOI18N - "default value will be used instead: "+j2eeSpec); // NOI18N - updateJ2EESpec(project, project.getAntProjectHelper(), j2eeSpec); + "default value will be used instead: "+j2eeProfile); // NOI18N + updateJ2EESpec(project, project.getAntProjectHelper(), j2eeProfile); } - String instance = BrokenServerSupport.selectServer(j2eeSpec, J2eeModule.CLIENT); + String instance = BrokenServerSupport.selectServer(j2eeProfile, J2eeModule.CLIENT); if (instance != null) { AppClientProjectProperties.setServerInstance( project, helper.getAntProjectHelper(), instance); @@ -490,12 +491,12 @@ checkMissingServer(); } - private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final String j2eeSpec) { + private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final Profile j2eeProfile) { ProjectManager.mutex().postWriteRequest(new Runnable() { public void run() { try { EditableProperties projectProps = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); - projectProps.put(AppClientProjectProperties.J2EE_PLATFORM, j2eeSpec); + projectProps.put(AppClientProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); helper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, projectProps); ProjectManager.getDefault().saveProject(project); } catch (IOException e) { diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientCompositePanelProvider.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientCompositePanelProvider.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientCompositePanelProvider.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientCompositePanelProvider.java @@ -45,6 +45,7 @@ import java.util.ResourceBundle; import javax.swing.JComponent; import javax.swing.JPanel; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.clientproject.AppClientProject; import org.netbeans.modules.j2ee.clientproject.wsclient.CustomizerWSClientHost; import org.netbeans.modules.j2ee.clientproject.wsclient.NoWebServiceClientsPanel; @@ -125,7 +126,7 @@ if (clientSupport != null) { serviceClientsSettings = clientSupport.getServiceClients(); } - if(J2EEProjectProperties.J2EE_1_4.equals( + if(EjbProjectConstants.J2EE_14_LEVEL.equals( project.getCarModule().getJ2eePlatformVersion()) && serviceClientsSettings != null && serviceClientsSettings.size() > 0) { ProjectCustomizer.Category clients = ProjectCustomizer.Category.create(WEBSERVICECLIENTS, diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java @@ -85,6 +85,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.java.api.common.SourceRoots; import org.netbeans.modules.java.api.common.ant.UpdateHelper; import org.netbeans.modules.java.api.common.project.ProjectProperties; @@ -334,8 +335,8 @@ PLATFORM_MODEL = PlatformUiSupport.createPlatformComboBoxModel (evaluator.getProperty(JAVA_PLATFORM)); PLATFORM_LIST_RENDERER = PlatformUiSupport.createPlatformListCellRenderer(); SpecificationVersion minimalSourceLevel = null; - if (J2EEProjectProperties.JAVA_EE_5.equals(evaluator.getProperty(J2EE_PLATFORM))) { - minimalSourceLevel = new SpecificationVersion(J2EEProjectProperties.JAVA_EE_5); + if (Profile.JAVA_EE_5.equals(Profile.fromPropertiesString(evaluator.getProperty(J2EE_PLATFORM)))) { + minimalSourceLevel = new SpecificationVersion("1.5"); } JAVAC_SOURCE_MODEL = PlatformUiSupport.createSourceLevelComboBoxModel(PLATFORM_MODEL, evaluator.getProperty(JAVAC_SOURCE), evaluator.getProperty(JAVAC_TARGET), minimalSourceLevel); JAVAC_SOURCE_RENDERER = PlatformUiSupport.createSourceLevelListCellRenderer (); diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle.properties b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle.properties --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle.properties +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle.properties @@ -67,10 +67,6 @@ LBL_IW_CreatedFile_LabelMnemonic=F ACS_LBL_IW_CreatedFile_A11YDesc=Location of the created buildfile -#ImportLocationVisual -J2EESpecLevel_15=Java EE 5 -J2EESpecLevel_14=J2EE 1.4 -J2EESpecLevel_13=J2EE 1.3 ACS_NWP1_NamePanel_A11YDesc=Project Name and Location Panel #LBL_IW_ImportTitle=Name and Location TXT_ImportAppClientModule=Enterprise Application Client with Existing Sources diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/ImportAppClientProjectWizardIterator.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/ImportAppClientProjectWizardIterator.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/ImportAppClientProjectWizardIterator.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/ImportAppClientProjectWizardIterator.java @@ -54,6 +54,7 @@ import org.netbeans.modules.j2ee.api.ejbjar.Ear; import org.netbeans.modules.j2ee.clientproject.AppClientProject; import org.netbeans.modules.j2ee.clientproject.Utils; +import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectCreateData; import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectGenerator; import org.netbeans.modules.j2ee.common.project.ui.UserProjectSettings; import org.netbeans.modules.j2ee.common.SharabilityUtility; @@ -61,6 +62,7 @@ import org.netbeans.modules.j2ee.common.project.ui.ProjectLocationWizardPanel; import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.ui.support.ProjectChooser; import org.openide.WizardDescriptor; @@ -113,22 +115,21 @@ if (dirF != null) { dirF = FileUtil.normalizeFile(dirF); } - String name = (String) wiz.getProperty(ProjectLocationWizardPanel.NAME); -// File dirSrcF = (File) wiz.getProperty (WizardProperties.SOURCE_ROOT); - File[] sourceFolders = (File[]) wiz.getProperty(WizardProperties.JAVA_ROOT); - File[] testFolders = (File[]) wiz.getProperty(WizardProperties.TEST_ROOT); - File configFilesFolder = (File) wiz.getProperty(WizardProperties.CONFIG_FILES_FOLDER); - File libName = (File) wiz.getProperty(WizardProperties.LIB_FOLDER); - String serverInstanceID = (String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID); - String j2eeLevel = (String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); - - String librariesDefinition = - SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES)); - String serverLibraryName = (String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY); - - AntProjectHelper h = AppClientProjectGenerator.importProject(dirF, name, - sourceFolders, testFolders, configFilesFolder, libName, j2eeLevel, - serverInstanceID, librariesDefinition, serverLibraryName); + + AppClientProjectCreateData createData = new AppClientProjectCreateData(); + createData.setProjectDir(dirF); + createData.setName((String) wiz.getProperty(ProjectLocationWizardPanel.NAME)); + createData.setSourceFolders((File[]) wiz.getProperty(WizardProperties.JAVA_ROOT)); + createData.setTestFolders((File[]) wiz.getProperty(WizardProperties.TEST_ROOT)); + createData.setConfFolder((File) wiz.getProperty(WizardProperties.CONFIG_FILES_FOLDER)); + createData.setLibFolder((File) wiz.getProperty(WizardProperties.LIB_FOLDER)); + createData.setServerInstanceID((String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID)); + createData.setJavaEEProfile((Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL)); + createData.setLibrariesDefinition( + SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES))); + createData.setServerLibraryName((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY)); + + AntProjectHelper h = AppClientProjectGenerator.importProject(createData); handle.progress(2); @@ -151,7 +152,7 @@ } // remember last used server - UserProjectSettings.getDefault().setLastUsedServer(serverInstanceID); + UserProjectSettings.getDefault().setLastUsedServer(createData.getServerInstanceID()); // downgrade the Java platform or src level to 1.4 String platformName = (String)wiz.getProperty(ProjectServerWizardPanel.JAVA_PLATFORM); diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/NewAppClientProjectWizardIterator.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/NewAppClientProjectWizardIterator.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/NewAppClientProjectWizardIterator.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/NewAppClientProjectWizardIterator.java @@ -55,12 +55,14 @@ import org.netbeans.api.project.ProjectManager; import org.netbeans.modules.j2ee.api.ejbjar.Ear; import org.netbeans.modules.j2ee.clientproject.AppClientProject; +import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectCreateData; import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectGenerator; import org.netbeans.modules.j2ee.common.project.ui.UserProjectSettings; import org.netbeans.modules.j2ee.common.SharabilityUtility; import org.netbeans.modules.j2ee.common.project.ui.ProjectLocationWizardPanel; import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.spi.java.project.support.ui.SharableLibrariesUtils; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.ui.support.ProjectChooser; @@ -116,18 +118,19 @@ if (dirF != null) { dirF = FileUtil.normalizeFile(dirF); } - String name = (String)wiz.getProperty(ProjectLocationWizardPanel.NAME); + String mainClass = (String)wiz.getProperty(ProjectServerWizardPanel.MAIN_CLASS); + AppClientProjectCreateData createData = new AppClientProjectCreateData(); + createData.setProjectDir(dirF); + createData.setName((String)wiz.getProperty(ProjectLocationWizardPanel.NAME)); + createData.setMainClass(mainClass); + createData.setServerInstanceID((String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID)); + createData.setJavaEEProfile((Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL)); + createData.setLibrariesDefinition( + SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES))); + createData.setServerLibraryName((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY)); - String serverInstanceID = (String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID); - String j2eeLevel = (String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); - - String librariesDefinition = - SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES)); - String serverLibraryName = (String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY); - - AntProjectHelper h = AppClientProjectGenerator.createProject(dirF, name, - mainClass, j2eeLevel, serverInstanceID, librariesDefinition, serverLibraryName); + AntProjectHelper h = AppClientProjectGenerator.createProject(createData); handle.progress(2); @@ -155,8 +158,8 @@ } // remember last used server - UserProjectSettings.getDefault().setLastUsedServer(serverInstanceID); - SharableLibrariesUtils.setLastProjectSharable(librariesDefinition != null); + UserProjectSettings.getDefault().setLastUsedServer(createData.getServerInstanceID()); + SharableLibrariesUtils.setLastProjectSharable(createData.getLibrariesDefinition() != null); // downgrade the Java platform or src level to 1.4 String platformName = (String)wiz.getProperty(ProjectServerWizardPanel.JAVA_PLATFORM); diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectWebServicesClientSupport.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectWebServicesClientSupport.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectWebServicesClientSupport.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectWebServicesClientSupport.java @@ -61,6 +61,7 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; import org.netbeans.api.project.ui.OpenProjects; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.clientproject.AppClientProject; import org.netbeans.modules.j2ee.clientproject.AppClientProjectType; import org.netbeans.modules.j2ee.clientproject.AppClientProvider; @@ -504,7 +505,7 @@ public List getStubDescriptors() { ArrayList stubs = new ArrayList(2); String version = project.getCarModule().getJ2eePlatformVersion(); - if(J2eeModule.J2EE_14.equals(version)) { + if (EjbProjectConstants.J2EE_14_LEVEL.equals(version)) { stubs.add(jsr109ClientStub); } stubs.add(jaxrpcClientStub); diff --git a/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientProviderTest.java b/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientProviderTest.java --- a/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientProviderTest.java +++ b/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientProviderTest.java @@ -45,6 +45,7 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; import org.netbeans.junit.NbTestCase; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.clientproject.test.TestUtil; import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties; import org.netbeans.modules.j2ee.dd.api.client.AppClientMetadata; @@ -124,11 +125,11 @@ public void testNeedConfigurationFolder() { assertTrue("1.3 needs configuration folder", - AppClientProvider.needConfigurationFolder(J2EEProjectProperties.J2EE_1_3)); + AppClientProvider.needConfigurationFolder(EjbProjectConstants.J2EE_13_LEVEL)); assertTrue("1.4 needs configuration folder", - AppClientProvider.needConfigurationFolder(J2EEProjectProperties.J2EE_1_4)); + AppClientProvider.needConfigurationFolder(EjbProjectConstants.J2EE_14_LEVEL)); assertFalse("5.0 does not need configuration folder", - AppClientProvider.needConfigurationFolder(J2EEProjectProperties.JAVA_EE_5)); + AppClientProvider.needConfigurationFolder(EjbProjectConstants.JAVA_EE_5_LEVEL)); assertFalse("Anything else does not need configuration folder", AppClientProvider.needConfigurationFolder("5.0")); assertFalse("Anything else does not need configuration folder", diff --git a/j2ee.common/manifest.mf b/j2ee.common/manifest.mf --- a/j2ee.common/manifest.mf +++ b/j2ee.common/manifest.mf @@ -2,5 +2,5 @@ OpenIDE-Module: org.netbeans.modules.j2ee.common/1 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/common/Bundle.properties OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker -OpenIDE-Module-Specification-Version: 1.37 +OpenIDE-Module-Specification-Version: 1.38 AutoUpdate-Show-In-Client: false diff --git a/j2ee.common/nbproject/project.xml b/j2ee.common/nbproject/project.xml --- a/j2ee.common/nbproject/project.xml +++ b/j2ee.common/nbproject/project.xml @@ -158,7 +158,7 @@ 4 - 1.23 + 1.58 diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/Util.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/Util.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/Util.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/Util.java @@ -382,6 +382,7 @@ * is not known specification version constant * * @since 1.18 + * @deprecated */ public static String getJ2eeSpecificationLabel(String specificationVersion) { Parameters.notNull("specificationVersion", specificationVersion); // NOI18N diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/Bundle.properties b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/Bundle.properties --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/Bundle.properties +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/Bundle.properties @@ -47,11 +47,6 @@ #Sharable visual panel PanelSharabilityVisual.label=Sharability -#J2eePlatformUiSupport -JAVA_EE_5_displayName=Java EE 5 -J2EE_1_4_displayName=J2EE 1.4 -J2EE_1_3_displayName=J2EE 1.3 - #Sharable panel PanelSharability.licenseWarning.text=There may be legal considerations when sharing server JAR files. Be sure to check the license for your server to make sure you can distribute server JAR files to other developers. PanelSharability.relativePathWarning.text=Please make sure the relative path to library definitions is always accessible in the same way. @@ -110,9 +105,6 @@ LBL_PanelOptions_SharableProject_Checkbox=Project Shared With Other Users LBL_PanelOptions_Location_Label=Sharable Libraries Location: LBL_Browse_Libraries_AcceptedFiles=*.properties files -JavaEESpecLevel_50=Java EE 5 -J2EESpecLevel_14=J2EE 1.4 -J2EESpecLevel_13=J2EE 1.3 ACS_LBL_NWP1_SetAsMain_A11YDesc=Set as Main Project ACS_LBL_NPW1_J2EESpecLevel_A11YDesc=Java EE Version Combo Box ACS_LBL_NWP1_ContextPath_A11YDesc=Context Path diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2EEProjectProperties.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2EEProjectProperties.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2EEProjectProperties.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2EEProjectProperties.java @@ -52,10 +52,6 @@ */ public final class J2EEProjectProperties { - public static final String JAVA_EE_5 = "1.5"; // NOI18N - public static final String J2EE_1_4 = "1.4"; // NOI18N - public static final String J2EE_1_3 = "1.3"; // NOI18N - public static final String J2EE_PLATFORM_CLASSPATH = "j2ee.platform.classpath"; //NOI18N /** diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eePlatformUiSupport.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eePlatformUiSupport.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eePlatformUiSupport.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eePlatformUiSupport.java @@ -51,6 +51,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.openide.util.NbBundle; /** @@ -58,37 +59,53 @@ * @author Andrei Badea, Radko Najman */ public class J2eePlatformUiSupport { - - private static final String JAVA_EE_5_DISPLAY_NAME = NbBundle.getMessage(J2eePlatformUiSupport.class, "JAVA_EE_5_displayName"); // NOI18N - private static final String J2EE_1_4_DISPLAY_NAME = NbBundle.getMessage(J2eePlatformUiSupport.class, "J2EE_1_4_displayName"); // NOI18N - private static final String J2EE_1_3_DISPLAY_NAME = NbBundle.getMessage(J2eePlatformUiSupport.class, "J2EE_1_3_displayName"); // NOI18N private J2eePlatformUiSupport() { } - + + @Deprecated public static ComboBoxModel createPlatformComboBoxModel(String serverInstanceId, String j2eeLevel, Object moduleType) { - return new J2eePlatformComboBoxModel(serverInstanceId, j2eeLevel, moduleType); + return new J2eePlatformComboBoxModel(serverInstanceId, Profile.fromPropertiesString(j2eeLevel), moduleType); } - + + public static ComboBoxModel createPlatformComboBoxModel(String serverInstanceId, Profile j2eeProfile, Object moduleType) { + return new J2eePlatformComboBoxModel(serverInstanceId, j2eeProfile, moduleType); + } + + @Deprecated public static ComboBoxModel createSpecVersionComboBoxModel(String j2eeSpecVersion) { - return new J2eeSpecVersionComboBoxModel(j2eeSpecVersion); + return new J2eeSpecVersionComboBoxModel(Profile.fromPropertiesString(j2eeSpecVersion)); } - + + public static ComboBoxModel createSpecVersionComboBoxModel(Profile profile) { + return new J2eeSpecVersionComboBoxModel(profile); + } + public static boolean getJ2eePlatformAndSpecVersionMatch(Object j2eePlatformModelObject, Object j2eeSpecVersionModelObject, Object moduleType) { - if (!(j2eePlatformModelObject instanceof J2eePlatformAdapter && j2eeSpecVersionModelObject instanceof String)) { + if (!(j2eePlatformModelObject instanceof J2eePlatformAdapter + && (j2eeSpecVersionModelObject instanceof String || j2eeSpecVersionModelObject instanceof Profile))) { return false; } - + J2eePlatform j2eePlatform = ((J2eePlatformAdapter)j2eePlatformModelObject).getJ2eePlatform(); - String specVersion = (String)j2eeSpecVersionModelObject; - return j2eePlatform.getSupportedSpecVersions(moduleType).contains(specVersion); + Profile profile = null; + if (j2eeSpecVersionModelObject instanceof Profile) { + profile = (Profile) j2eeSpecVersionModelObject; + } else { + profile = Profile.fromPropertiesString((String) j2eeSpecVersionModelObject); + } + return j2eePlatform.getSupportedProfiles(moduleType).contains(profile); } - + + @Deprecated public static String getSpecVersion(Object j2eeSpecVersionModelObject) { - return ((J2eePlatformComboBoxItem)j2eeSpecVersionModelObject).getCode(); + return ((J2eePlatformComboBoxItem)j2eeSpecVersionModelObject).getProfile().toPropertiesString(); } - + + public static Profile getJavaEEProfile(Object j2eeSpecVersionModelObject) { + return ((J2eePlatformComboBoxItem) j2eeSpecVersionModelObject).getProfile(); + } public static String getServerInstanceID(Object j2eePlatformModelObject) { if (j2eePlatformModelObject == null) @@ -120,12 +137,12 @@ private J2eePlatformAdapter[] j2eePlatforms; private final String initialJ2eePlatform; private J2eePlatformAdapter selectedJ2eePlatform; - private final String j2eeLevel; + private final Profile j2eeProfile; private final Object moduleType; - public J2eePlatformComboBoxModel(String serverInstanceID, String j2eeLevel, Object moduleType) { + public J2eePlatformComboBoxModel(String serverInstanceID, Profile j2eeProfile, Object moduleType) { initialJ2eePlatform = serverInstanceID; - this.j2eeLevel = j2eeLevel; + this.j2eeProfile = j2eeProfile; this.moduleType = moduleType; getJ2eePlatforms(moduleType); @@ -166,7 +183,7 @@ J2eePlatform j2eePlatform = Deployment.getDefault().getJ2eePlatform(serverInstanceIDs[i]); if (j2eePlatform != null) { if (j2eePlatform.getSupportedModuleTypes().contains(moduleType) - && j2eePlatform.getSupportedSpecVersions(moduleType).contains(j2eeLevel)) { + && j2eePlatform.getSupportedProfiles(moduleType).contains(j2eeProfile)) { J2eePlatformAdapter adapter = new J2eePlatformAdapter(j2eePlatform, serverInstanceIDs[i]); orderedNames.add(adapter); @@ -224,15 +241,15 @@ private J2eePlatformComboBoxItem initialJ2eeSpecVersion; private J2eePlatformComboBoxItem selectedJ2eeSpecVersion; - public J2eeSpecVersionComboBoxModel(String j2eeSpecVersion) { - initialJ2eeSpecVersion = new J2eePlatformComboBoxItem(j2eeSpecVersion); + public J2eeSpecVersionComboBoxModel(Profile j2eeProfile) { + initialJ2eeSpecVersion = new J2eePlatformComboBoxItem(j2eeProfile); List orderedListItems = new ArrayList(); - orderedListItems.add(new J2eePlatformComboBoxItem(J2EEProjectProperties.JAVA_EE_5)); - orderedListItems.add(new J2eePlatformComboBoxItem(J2EEProjectProperties.J2EE_1_4)); - if (!J2EEProjectProperties.JAVA_EE_5.equals(initialJ2eeSpecVersion.getCode()) && - !J2EEProjectProperties.J2EE_1_4.equals(initialJ2eeSpecVersion.getCode())) { - orderedListItems.add(0, new J2eePlatformComboBoxItem(J2EEProjectProperties.J2EE_1_3)); + orderedListItems.add(new J2eePlatformComboBoxItem(Profile.JAVA_EE_5)); + orderedListItems.add(new J2eePlatformComboBoxItem(Profile.J2EE_14)); + if (!(Profile.JAVA_EE_5 == initialJ2eeSpecVersion.getProfile()) && + !(Profile.J2EE_14 == initialJ2eeSpecVersion.getProfile())) { + orderedListItems.add(0, new J2eePlatformComboBoxItem(Profile.J2EE_13)); } j2eeSpecVersions = orderedListItems.toArray(new J2eePlatformComboBoxItem[orderedListItems.size()]); @@ -257,41 +274,19 @@ } private static final class J2eePlatformComboBoxItem{ - private String code; - private String displayName; + private final Profile profile; - public J2eePlatformComboBoxItem (String code, String displayName){ - this.code = code; - this.displayName = displayName; + public J2eePlatformComboBoxItem (Profile profile){ + this.profile = profile; } - public J2eePlatformComboBoxItem (String code){ - this(code, findDisplayName(code)); - } - - private static String findDisplayName(String code){ - if (code == null) { - return ""; - } - if(code.equals(J2EEProjectProperties.JAVA_EE_5)) { - return JAVA_EE_5_DISPLAY_NAME; - } - if(code.equals(J2EEProjectProperties.J2EE_1_4)) { - return J2EE_1_4_DISPLAY_NAME; - } - if(code.equals(J2EEProjectProperties.J2EE_1_3)) { - return J2EE_1_3_DISPLAY_NAME; - } - return code; //version display name not found, use the version code for display name - } - - public String getCode(){ - return code; + public Profile getProfile() { + return profile; } @Override public String toString(){ - return displayName; + return profile.getDisplayName(); } } diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eeVersionWarningPanel.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eeVersionWarningPanel.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eeVersionWarningPanel.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eeVersionWarningPanel.java @@ -46,6 +46,7 @@ import org.netbeans.api.java.platform.Specification; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.common.project.ui.UserProjectSettings; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.openide.modules.SpecificationVersion; /** @@ -134,26 +135,26 @@ } return javaPlatformName; } - - public static String findWarningType(String j2eeLevel) { + + public static String findWarningType(Profile j2eeProfile) { // System.out.println("findWarningType: j2eeLevel="+j2eeLevel); JavaPlatform defaultPlatform = JavaPlatformManager.getDefault().getDefaultPlatform(); SpecificationVersion version = defaultPlatform.getSpecification().getVersion(); String sourceLevel = version.toString(); // #89131: these levels are not actually distinct from 1.5. if (sourceLevel.equals("1.6") || sourceLevel.equals("1.7")) - sourceLevel = "1.5"; + sourceLevel = "1.5"; // System.out.println("default platform is "+version); - + // no warning if 1.4 is the default for j2ee14 - if (new SpecificationVersion("1.4").equals(version) && j2eeLevel.equals(J2eeModule.J2EE_14)) // NOI18N + if (new SpecificationVersion("1.4").equals(version) && j2eeProfile == Profile.J2EE_14) // NOI18N return null; - + // no warning if 1.5, 1.6, 1.7 is the default for j2ee15 - if ("1.5".equals(sourceLevel) && j2eeLevel.equals(J2eeModule.JAVA_EE_5)) // NOI18N + if ("1.5".equals(sourceLevel) && j2eeProfile == Profile.JAVA_EE_5) // NOI18N return null; - - if (j2eeLevel.equals(J2eeModule.J2EE_14)) { + + if (j2eeProfile == Profile.J2EE_14) { JavaPlatform[] java14Platforms = getJavaPlatforms("1.4"); //NOI18N if (java14Platforms.length > 0) { // the user has JDK 1.4, so we warn we'll downgrade to 1.4 @@ -162,7 +163,7 @@ // no JDK 1.4, the best we can do is downgrade the source level to 1.4 return WARN_SET_SOURCE_LEVEL_14; } - } else if (j2eeLevel.equals(J2eeModule.JAVA_EE_5)) { + } else if (j2eeProfile == Profile.JAVA_EE_5) { JavaPlatform[] java15Platforms = getJavaPlatforms("1.5"); //NOI18N if (java15Platforms.length > 0) { // the user has JDK 1.4, so we warn we'll downgrade to 1.4 @@ -176,6 +177,11 @@ return null; } } + + @Deprecated + public static String findWarningType(String j2eeLevel) { + return findWarningType(Profile.fromPropertiesString(j2eeLevel)); + } private static JavaPlatform[] getJavaPlatforms(String level) { return JavaPlatformManager.getDefault().getPlatforms(null, new Specification("J2SE", new SpecificationVersion(level))); // NOI18N diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.form b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.form --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.form +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.form @@ -12,6 +12,7 @@ + @@ -32,20 +33,20 @@ - + - + - + - + @@ -56,7 +57,7 @@ - + @@ -76,11 +77,11 @@ - + - + diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.java @@ -65,6 +65,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.ServerManager; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeApplicationProvider; import org.netbeans.modules.j2ee.common.project.ui.UserProjectSettings; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.spi.project.support.ant.PropertyUtils; import org.openide.WizardDescriptor; import org.openide.filesystems.FileObject; @@ -82,10 +83,6 @@ private J2eeVersionWarningPanel warningPanel; private boolean sharableProject; - - private static final String J2EE_SPEC_13_LABEL = NbBundle.getMessage(ProjectServerPanel.class, "J2EESpecLevel_13"); //NOI18N - private static final String J2EE_SPEC_14_LABEL = NbBundle.getMessage(ProjectServerPanel.class, "J2EESpecLevel_14"); //NOI18N - private static final String JAVA_EE_SPEC_50_LABEL = NbBundle.getMessage(ProjectServerPanel.class, "JavaEESpecLevel_50"); //NOI18N private List earProjects; private Object j2eeModuleType; @@ -385,18 +382,18 @@ if (serverInstanceWrapper != null) { selectedServerInstanceID = serverInstanceWrapper.getServerInstanceID(); } - String lastSelectedJ2eeSpecLevel = (String) j2eeSpecComboBox.getSelectedItem(); + ProfileItem lastSelectedJ2eeProfile = (ProfileItem) j2eeSpecComboBox.getSelectedItem(); String newServerInstanceID = ServerManager.showAddServerInstanceWizard(); if (newServerInstanceID != null) { selectedServerInstanceID = newServerInstanceID; // clear the spec level selection - lastSelectedJ2eeSpecLevel = null; + lastSelectedJ2eeProfile = null; j2eeSpecComboBox.setSelectedItem(null); } // refresh the list of servers initServers(selectedServerInstanceID); - if (lastSelectedJ2eeSpecLevel != null) { - j2eeSpecComboBox.setSelectedItem(lastSelectedJ2eeSpecLevel); + if (lastSelectedJ2eeProfile != null) { + j2eeSpecComboBox.setSelectedItem(lastSelectedJ2eeProfile); } }//GEN-LAST:event_addServerButtonActionPerformed @@ -405,27 +402,20 @@ }//GEN-LAST:event_j2eeSpecComboBoxActionPerformed private void serverInstanceComboBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_serverInstanceComboBoxActionPerformed - String prevSelectedItem = (String) j2eeSpecComboBox.getSelectedItem(); + ProfileItem prevSelectedItem = (ProfileItem) j2eeSpecComboBox.getSelectedItem(); // update the j2ee spec list according to the selected server ServerInstanceWrapper serverInstanceWrapper = (ServerInstanceWrapper) serversModel.getSelectedItem(); + j2eeSpecComboBox.removeAllItems(); if (serverInstanceWrapper != null) { J2eePlatform j2eePlatform = Deployment.getDefault().getJ2eePlatform(serverInstanceWrapper.getServerInstanceID()); - Set supportedVersions = j2eePlatform.getSupportedSpecVersions(j2eeModuleType); - j2eeSpecComboBox.removeAllItems(); - if (supportedVersions.contains(J2eeModule.JAVA_EE_5)) { - j2eeSpecComboBox.addItem(JAVA_EE_SPEC_50_LABEL); - } - if (supportedVersions.contains(J2eeModule.J2EE_14)) { - j2eeSpecComboBox.addItem(J2EE_SPEC_14_LABEL); - } - if (supportedVersions.contains(J2eeModule.J2EE_13)) { - j2eeSpecComboBox.addItem(J2EE_SPEC_13_LABEL); + Set profiles = new TreeSet(Profile.REVERSE_COMPARATOR); + profiles.addAll(j2eePlatform.getSupportedProfiles(j2eeModuleType)); + for (Profile profile : profiles) { + j2eeSpecComboBox.addItem(new ProfileItem(profile)); } if (prevSelectedItem != null) { j2eeSpecComboBox.setSelectedItem(prevSelectedItem); } - } else { - j2eeSpecComboBox.removeAllItems(); } // revalidate the form wizard.fireChangeEvent(); @@ -548,7 +538,7 @@ void store(WizardDescriptor d) { d.putProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID, getSelectedServer()); - d.putProperty(ProjectServerWizardPanel.J2EE_LEVEL, getSelectedJ2eeSpec()); + d.putProperty(ProjectServerWizardPanel.J2EE_LEVEL, getSelectedJ2eeProfile()); d.putProperty(ProjectServerWizardPanel.CONTEXT_PATH, jTextFieldContextPath.getText().trim()); d.putProperty(ProjectServerWizardPanel.EAR_APPLICATION, getSelectedEarApplication()); d.putProperty(ProjectServerWizardPanel.WAR_NAME, jTextFieldWebAppName.getText()); @@ -564,7 +554,7 @@ if (warningPanel != null && warningPanel.getDowngradeAllowed()) { d.putProperty(ProjectServerWizardPanel.JAVA_PLATFORM, warningPanel.getSuggestedJavaPlatformName()); - String j2ee = getSelectedJ2eeSpec(); + Profile j2ee = getSelectedJ2eeProfile(); if (j2ee != null) { String warningType = J2eeVersionWarningPanel.findWarningType(j2ee); UserProjectSettings fls = UserProjectSettings.getDefault(); @@ -701,11 +691,9 @@ } } - private String getSelectedJ2eeSpec() { - Object item = j2eeSpecComboBox.getSelectedItem(); - return item == null ? null - : item.equals(JAVA_EE_SPEC_50_LABEL) ? J2eeModule.JAVA_EE_5 : - ( item.equals(J2EE_SPEC_14_LABEL) ? J2eeModule.J2EE_14 : J2eeModule.J2EE_13); + private Profile getSelectedJ2eeProfile() { + ProfileItem item = (ProfileItem) j2eeSpecComboBox.getSelectedItem(); + return item == null ? null : item.getProfile(); } private String getSelectedServer() { @@ -749,7 +737,7 @@ } private void setJ2eeVersionWarningPanel() { - String j2ee = getSelectedJ2eeSpec(); + Profile j2ee = getSelectedJ2eeProfile(); if (j2ee == null) { warningPlaceHolderPanel.setVisible(false); return; @@ -810,7 +798,7 @@ } } else { // suppose highest - j2eeSpecComboBox.setSelectedItem(JAVA_EE_SPEC_50_LABEL); + j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.JAVA_EE_5)); } } } @@ -835,9 +823,9 @@ } if(new BigDecimal(org.netbeans.modules.j2ee.dd.api.ejb.EjbJar.VERSION_2_0).equals(version)) { - j2eeSpecComboBox.setSelectedItem(J2EE_SPEC_13_LABEL); + j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.J2EE_13)); } else if(new BigDecimal(org.netbeans.modules.j2ee.dd.api.ejb.EjbJar.VERSION_2_1).equals(version)) { - j2eeSpecComboBox.setSelectedItem(J2EE_SPEC_14_LABEL); + j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.J2EE_14)); } } catch (IOException e) { String message = NbBundle.getMessage(ProjectServerPanel.class, "MSG_EjbJarXmlCorrupted"); // NOI18N @@ -862,11 +850,11 @@ } if (new BigDecimal(org.netbeans.modules.j2ee.dd.api.client.AppClient.VERSION_1_3).equals(version)) { - j2eeSpecComboBox.setSelectedItem(J2EE_SPEC_13_LABEL); + j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.J2EE_13)); } else if(new BigDecimal(org.netbeans.modules.j2ee.dd.api.client.AppClient.VERSION_1_4).equals(version)) { - j2eeSpecComboBox.setSelectedItem(J2EE_SPEC_14_LABEL); + j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.J2EE_14)); } else if(new BigDecimal(org.netbeans.modules.j2ee.dd.api.client.AppClient.VERSION_5_0).equals(version)) { - j2eeSpecComboBox.setSelectedItem(JAVA_EE_SPEC_50_LABEL); + j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.JAVA_EE_5)); } } catch (IOException e) { String message = NbBundle.getMessage(ProjectServerPanel.class, "MSG_AppClientXmlCorrupted"); // NOI18N @@ -876,9 +864,10 @@ private void setJ2eeVersionWarning(WizardDescriptor d) { String errorMessage; - String selectedItem = (String)j2eeSpecComboBox.getSelectedItem(); + ProfileItem selectedItem = (ProfileItem) j2eeSpecComboBox.getSelectedItem(); - if (J2EE_SPEC_14_LABEL.equals(selectedItem) && new BigDecimal(org.netbeans.modules.j2ee.dd.api.ejb.EjbJar.VERSION_2_0).equals(xmlVersion)) { + if ((Profile.J2EE_14 == selectedItem.getProfile()) + && new BigDecimal(org.netbeans.modules.j2ee.dd.api.ejb.EjbJar.VERSION_2_0).equals(xmlVersion)) { errorMessage = NbBundle.getMessage(ProjectServerPanel.class, "MSG_EjbJarXMLNotSupported"); } else { errorMessage = null; @@ -937,4 +926,45 @@ public HelpCtx getHelpCtx() { return new HelpCtx(ProjectImportLocationPanel.generateHelpID(ProjectServerPanel.class, j2eeModuleType)); } + + private static class ProfileItem { + + private final Profile profile; + + public ProfileItem(Profile profile) { + this.profile = profile; + } + + public Profile getProfile() { + return profile; + } + + @Override + public String toString() { + return profile.getDisplayName(); + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final ProfileItem other = (ProfileItem) obj; + if (this.profile != other.profile && (this.profile == null || !this.profile.equals(other.profile))) { + return false; + } + return true; + } + + @Override + public int hashCode() { + int hash = 7; + hash = 97 * hash + (this.profile != null ? this.profile.hashCode() : 0); + return hash; + } + + } } diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerSupport.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerSupport.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerSupport.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerSupport.java @@ -44,10 +44,10 @@ import java.awt.Dialog; import javax.swing.JButton; import javax.swing.SwingUtilities; -import org.netbeans.modules.j2ee.common.*; import org.netbeans.modules.j2ee.common.ui.NoSelectedServerWarning; import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.openide.DialogDescriptor; import org.openide.DialogDisplayer; import org.openide.util.NbBundle; @@ -91,6 +91,7 @@ * @param j2eeSpec one of {@link J2eeModule#EJB}, {@link J2eeModule#EAR} * @param moduleType * @return selected application server. Might be null. + * @deprecated */ public static String selectServer(final String j2eeSpec, final Object moduleType) { return NoSelectedServerWarning.selectServerDialog( @@ -99,6 +100,13 @@ NbBundle.getMessage(BrokenServerSupport.class, "ACSD_Resolve_Missing_Server")); // NOI18N } + public static String selectServer(final Profile j2eeProfile, final Object moduleType) { + return NoSelectedServerWarning.selectServerDialog( + new Object[] { moduleType }, j2eeProfile, + NbBundle.getMessage(BrokenServerSupport.class, "LBL_Resolve_Missing_Server_Title"), + NbBundle.getMessage(BrokenServerSupport.class, "ACSD_Resolve_Missing_Server")); // NOI18N + } + /** * Show alert message box informing user that a project has missing * server. This method can be safely called from any thread, e.g. during diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.form b/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.form --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.form +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.form @@ -1,12 +1,14 @@ - + + + @@ -105,7 +107,7 @@ - + diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.java @@ -53,8 +53,8 @@ import javax.swing.ListSelectionModel; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.api.ServerManager; import org.openide.DialogDescriptor; import org.openide.DialogDisplayer; @@ -65,17 +65,17 @@ * * @author Pavel Buzek */ -public final class NoSelectedServerWarning extends JPanel { +final class NoSelectedServerWarning extends JPanel { public static final String OK_ENABLED = "ok_enabled"; //NOI18N - private final String j2eeSpec; + private final Profile j2eeProfile; - private NoSelectedServerWarning(Object[] moduleTypes, String j2eeSpec) { - this.j2eeSpec = j2eeSpec; + private NoSelectedServerWarning(Object[] moduleTypes, Profile j2eeProfile) { + this.j2eeProfile = j2eeProfile; initComponents(); - serverList.setModel(new ServerListModel(moduleTypes, j2eeSpec)); + serverList.setModel(new ServerListModel(moduleTypes, j2eeProfile)); if (serverList.getModel().getSize() > 0) { jTextArea2.setVisible(false); } @@ -105,9 +105,14 @@ * * @return serverInstanceId of the selected server instance, null * if canceled. + * @deprecated */ public static String selectServerDialog(Object[] moduleTypes, String j2eeSpec, String title, String description) { - NoSelectedServerWarning panel = new NoSelectedServerWarning(moduleTypes, j2eeSpec); + return selectServerDialog(moduleTypes, Profile.fromPropertiesString(j2eeSpec), title, description); + } + + public static String selectServerDialog(Object[] moduleTypes, Profile j2eeProfile, String title, String description) { + NoSelectedServerWarning panel = new NoSelectedServerWarning(moduleTypes, j2eeProfile); Object[] options = new Object[] { DialogDescriptor.OK_OPTION, DialogDescriptor.CANCEL_OPTION @@ -161,7 +166,7 @@ * WARNING: Do NOT modify this code. The content of this method is * always regenerated by the Form Editor. */ - // //GEN-BEGIN:initComponents + // //GEN-BEGIN:initComponents private void initComponents() { java.awt.GridBagConstraints gridBagConstraints; @@ -239,7 +244,7 @@ jButtonAddServer.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(NoSelectedServerWarning.class, "ACSN_AddServer")); // NOI18N jButtonAddServer.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(NoSelectedServerWarning.class, "ACSD_AddServer")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(listLabel, org.openide.util.NbBundle.getMessage(NoSelectedServerWarning.class, "LBL_NoSelectedServerWarning_listLabel", new Object[] {Util.getJ2eeSpecificationLabel(j2eeSpec)})); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(listLabel, org.openide.util.NbBundle.getMessage(NoSelectedServerWarning.class, "LBL_NoSelectedServerWarning_listLabel", new Object[] {j2eeProfile.getDisplayName()})); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 2; @@ -286,12 +291,12 @@ private String[] instances; private final Object[] moduleTypes; - private final String j2eeSpec; + private final Profile j2eeProfile; - public ServerListModel(Object[] moduleTypes, String j2eeSpec) { + public ServerListModel(Object[] moduleTypes, Profile j2eeProfile) { this.moduleTypes = moduleTypes; - this.j2eeSpec = j2eeSpec; - instances = Deployment.getDefault().getServerInstanceIDs(moduleTypes, j2eeSpec); + this.j2eeProfile = j2eeProfile; + instances = Deployment.getDefault().getServerInstanceIDs(moduleTypes, j2eeProfile); } public synchronized int getSize() { @@ -308,7 +313,7 @@ public synchronized void refreshModel() { int oldLength = instances.length; - instances = Deployment.getDefault().getServerInstanceIDs(moduleTypes, j2eeSpec); + instances = Deployment.getDefault().getServerInstanceIDs(moduleTypes, j2eeProfile); if (instances.length > 0) { fireContentsChanged(this, 0, instances.length - 1); } else if (oldLength > 0) { diff --git a/j2ee.earproject/nbproject/project.xml b/j2ee.earproject/nbproject/project.xml --- a/j2ee.earproject/nbproject/project.xml +++ b/j2ee.earproject/nbproject/project.xml @@ -135,7 +135,7 @@ 1 - 1.36 + 1.38 @@ -152,7 +152,7 @@ - 1.1 + 1.16 @@ -170,7 +170,7 @@ 4 - 1.54 + 1.58 diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProject.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProject.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProject.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProject.java @@ -67,6 +67,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; import org.netbeans.modules.j2ee.earproject.classpath.ClassPathProviderImpl; import org.netbeans.modules.j2ee.earproject.classpath.ClassPathSupportCallbackImpl; @@ -640,8 +641,13 @@ return helper.getStandardPropertyEvaluator().getProperty(EarProjectProperties.J2EE_SERVER_INSTANCE); } + @Deprecated public String getJ2eePlatformVersion() { - return helper.getStandardPropertyEvaluator().getProperty(EarProjectProperties.J2EE_PLATFORM); + return helper.getStandardPropertyEvaluator().getProperty(EarProjectProperties.J2EE_PLATFORM); + } + + public Profile getJ2eeProfile() { + return Profile.fromPropertiesString(helper.getStandardPropertyEvaluator().getProperty(EarProjectProperties.J2EE_PLATFORM)); } public GeneratedFilesHelper getGeneratedFilesHelper() { diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectGenerator.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectGenerator.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectGenerator.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectGenerator.java @@ -58,6 +58,7 @@ import org.netbeans.api.project.ProjectUtils; import org.netbeans.api.project.ant.AntArtifact; import org.netbeans.api.project.ant.AntArtifactQuery; +import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectCreateData; import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectGenerator; import org.netbeans.modules.j2ee.common.SharabilityUtility; import org.netbeans.modules.java.api.common.classpath.ClassPathSupport; @@ -69,8 +70,10 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.ui.customizer.EarProjectProperties; import org.netbeans.modules.j2ee.earproject.util.EarProjectUtil; +import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectCreateData; import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectGenerator; import org.netbeans.modules.web.project.api.WebProjectCreateData; import org.netbeans.modules.web.project.api.WebProjectUtilities; @@ -109,19 +112,19 @@ private final File prjDir; private final String name; - private final String j2eeLevel; + private final Profile j2eeProfile; private final String serverInstanceID; private final String sourceLevel; private final FileObject prjDirFO; private String librariesDefinition; private String serverLibraryName; - private EarProjectGenerator(File prjDir, FileObject prjDirFO, String name, String j2eeLevel, + private EarProjectGenerator(File prjDir, FileObject prjDirFO, String name, Profile j2eeProfile, String serverInstanceID, String sourceLevel, String librariesDefinition, String serverLibraryName) { this.prjDir = prjDir; this.prjDirFO = prjDirFO; this.name = name; - this.j2eeLevel = j2eeLevel; + this.j2eeProfile = j2eeProfile; this.serverInstanceID = serverInstanceID; // #89131: these levels are not actually distinct from 1.5. if (sourceLevel != null && (sourceLevel.equals("1.6") || sourceLevel.equals("1.7"))) @@ -139,10 +142,10 @@ * @return the helper object permitting it to be further customized * @throws IOException in case something went wrong */ - public static AntProjectHelper createProject(File prjDir, String name, String j2eeLevel, + public static AntProjectHelper createProject(File prjDir, String name, Profile j2eeProfile, String serverInstanceId, String sourceLevel, String librariesDefinition, String serverLibraryName) throws IOException { FileObject projectDir = FileUtil.createFolder(prjDir); - final EarProjectGenerator earGen = new EarProjectGenerator(prjDir, projectDir, name, j2eeLevel, + final EarProjectGenerator earGen = new EarProjectGenerator(prjDir, projectDir, name, j2eeProfile, serverInstanceId, sourceLevel, librariesDefinition, serverLibraryName); final AntProjectHelper[] h = new AntProjectHelper[1]; @@ -157,13 +160,13 @@ } public static AntProjectHelper importProject(File pDir, final File sDir, String name, - String j2eeLevel, String serverInstanceID, final String platformName, + Profile j2eeProfile, String serverInstanceID, final String platformName, String sourceLevel, final Map userModules, String librariesDefinition, String serverLibraryName) throws IOException { FileObject projectDir = FileUtil.createFolder(pDir); final EarProjectGenerator earGen = new EarProjectGenerator(pDir, projectDir, name, - j2eeLevel, serverInstanceID, sourceLevel, librariesDefinition, serverLibraryName); + j2eeProfile, serverInstanceID, sourceLevel, librariesDefinition, serverLibraryName); final AntProjectHelper[] h = new AntProjectHelper[1]; // create project in one FS atomic action: @@ -204,7 +207,7 @@ } EarProject earProject = p.getLookup().lookup(EarProject.class); assert earProject != null; - setupDD(j2eeLevel, docBase, earProject); + setupDD(j2eeProfile, docBase, earProject); return h; } @@ -292,7 +295,7 @@ } } - setupDD(j2eeLevel, docBase, earProject); + setupDD(j2eeProfile, docBase, earProject); if (userModules == null || userModules.isEmpty()) { userModules = ModuleType.detectModules(srcPrjDirFO); @@ -414,11 +417,17 @@ private AntProjectHelper addAppClientModule(final FileObject javaRoot, final FileObject subprojectRoot, final File subProjDir, final String platformName) throws IOException { FileObject docBaseFO = FileUtil.createFolder(subprojectRoot, DEFAULT_DOC_BASE_FOLDER); File docBase = FileUtil.toFile(docBaseFO); - AntProjectHelper subProjHelper = AppClientProjectGenerator.importProject( - subProjDir, subprojectRoot.getName(), - new File[] { FileUtil.toFile(javaRoot) }, - new File[0], docBase, - null, checkJ2eeVersion(j2eeLevel, serverInstanceID, J2eeModule.CLIENT), serverInstanceID); + + AppClientProjectCreateData createData = new AppClientProjectCreateData(); + createData.setProjectDir(subProjDir); + createData.setName(subprojectRoot.getName()); + createData.setSourceFolders(new File[] { FileUtil.toFile(javaRoot) }); + createData.setTestFolders(new File[0]); + createData.setConfFolder(docBase); + createData.setJavaEEProfile(getAcceptableProfile(j2eeProfile, serverInstanceID, J2eeModule.CLIENT)); + createData.setServerInstanceID(serverInstanceID); + + AntProjectHelper subProjHelper = AppClientProjectGenerator.importProject(createData); if (platformName != null || sourceLevel != null) { AppClientProjectGenerator.setPlatform(subProjHelper, platformName, sourceLevel); } @@ -428,11 +437,17 @@ private AntProjectHelper addEJBModule(final FileObject javaRoot, final FileObject subprojectRoot, final File subProjDir, final String platformName) throws IOException { FileObject docBaseFO = FileUtil.createFolder(subprojectRoot, DEFAULT_DOC_BASE_FOLDER); File docBase = FileUtil.toFile(docBaseFO); - AntProjectHelper subProjHelper = EjbJarProjectGenerator.importProject( - subProjDir, subprojectRoot.getName(), - new File[] {FileUtil.toFile(javaRoot)}, - new File[0], docBase, - null, checkJ2eeVersion(j2eeLevel, serverInstanceID, J2eeModule.EJB), serverInstanceID); + + EjbJarProjectCreateData createData = new EjbJarProjectCreateData(); + createData.setProjectDir(subProjDir); + createData.setName(subprojectRoot.getName()); + createData.setSourceFolders(new File[] {FileUtil.toFile(javaRoot)}); + createData.setTestFolders(new File[0]); + createData.setConfigFilesBase(docBase); + createData.setJavaEEProfile(getAcceptableProfile(j2eeProfile, serverInstanceID, J2eeModule.EJB)); + createData.setServerInstanceID(serverInstanceID); + + AntProjectHelper subProjHelper = EjbJarProjectGenerator.importProject(createData); if (platformName != null || sourceLevel != null) { EjbJarProjectGenerator.setPlatform(subProjHelper, platformName, sourceLevel); } @@ -448,7 +463,7 @@ createData.setTestFolders(new File[0]); createData.setDocBase(FileUtil.createFolder(subprojectRoot, "web")); //NOI18N createData.setLibFolder(null); - createData.setJavaEEVersion(checkJ2eeVersion(j2eeLevel, serverInstanceID, J2eeModule.WAR)); + createData.setJavaEEProfile(getAcceptableProfile(j2eeProfile, serverInstanceID, J2eeModule.WAR)); createData.setServerInstanceID(serverInstanceID); createData.setBuildfile("build.xml"); //NOI18N createData.setJavaPlatformName(platformName); @@ -458,17 +473,22 @@ return WebProjectUtilities.importProject(createData); } - static FileObject setupDD(final String j2eeLevel, final FileObject docBase, + static FileObject setupDD(final Profile j2eeProfile, final FileObject docBase, final EarProject earProject) throws IOException { - return setupDD(j2eeLevel, docBase, earProject, false); + return setupDD(j2eeProfile, docBase, earProject, false); } + @Deprecated + public static FileObject setupDD(final String j2eeLevel, final FileObject docBase, + final Project earProject, boolean force) throws IOException { + return setupDD(Profile.fromPropertiesString(j2eeLevel), docBase, earProject, force); + } /** * Generate deployment descriptor (application.xml) if needed or forced (applies for JAVA EE 5). *

* For J2EE 1.4 or older the deployment descriptor is always generated if missing. * For JAVA EE 5 it is only generated if missing and forced as well. - * @param j2eeLevel J2EE level, see {@link J2eeModule J2eeModule constants}. + * @param j2eeprofile J2EE profile. * @param docBase Configuration directory. * @param earProject EAR project instance. * @param force if true application.xml is generated even if it's not needed @@ -476,7 +496,7 @@ * @return {@link FileObject} of the deployment descriptor or null. * @throws java.io.IOException if any error occurs. */ - public static FileObject setupDD(final String j2eeLevel, final FileObject docBase, + public static FileObject setupDD(final Profile j2eeProfile, final FileObject docBase, final Project earProject, boolean force) throws IOException { FileObject dd = docBase.getFileObject(ProjectEar.FILE_DD); if (dd != null) { @@ -486,7 +506,7 @@ if (EarProjectUtil.isDDCompulsory(earProject)) { template = FileUtil.getConfigFile( "org-netbeans-modules-j2ee-earproject/ear-1.4.xml"); // NOI18N - } else if (J2eeModule.JAVA_EE_5.equals(j2eeLevel)) { + } else if (Profile.JAVA_EE_5.equals(j2eeProfile)) { if (force) { template = FileUtil.getConfigFile( "org-netbeans-modules-j2ee-earproject/ear-5.xml"); // NOI18N @@ -504,7 +524,7 @@ "If it\'s *really* needed, set force param to true." + newLine); } } else { - assert false : "Unknown j2eeLevel: " + j2eeLevel; + assert false : "Unknown j2eeProfile: " + j2eeProfile; } if (template != null) { dd = FileUtil.copyFile(template, docBase, "application"); // NOI18N @@ -528,13 +548,13 @@ * For now the only check is to use J2EE 1.4 if JavaEE5 is not supported. * Otherwise use the requestedVersion. */ - public static String checkJ2eeVersion(String requestedVersion, String serverInstanceID, Object moduleType) { + public static Profile getAcceptableProfile(Profile requestedProfile, String serverInstanceID, Object moduleType) { J2eePlatform platform = Deployment.getDefault().getJ2eePlatform(serverInstanceID); - Set versions = platform.getSupportedSpecVersions(moduleType); - if (!versions.contains(requestedVersion) && (versions.contains(J2eeModule.J2EE_14))) { - return J2eeModule.J2EE_14; + Set profiles = platform.getSupportedProfiles(moduleType); + if (!profiles.contains(requestedProfile) && (profiles.contains(Profile.J2EE_14))) { + return Profile.J2EE_14; } - return requestedVersion; + return requestedProfile; } private static String relativePath(FileObject parent, FileObject child) { @@ -575,7 +595,7 @@ ep.setProperty(EarProjectProperties.DIST_DIR, "dist"); // NOI18N ep.setProperty(EarProjectProperties.DIST_JAR, "${" + EarProjectProperties.DIST_DIR + "}/${" + EarProjectProperties.JAR_NAME + "}"); // NOI18N - ep.setProperty(EarProjectProperties.J2EE_PLATFORM, j2eeLevel); + ep.setProperty(EarProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); ep.setProperty(EarProjectProperties.JAR_NAME, name + ".ear"); // NOI18N ep.setProperty(EarProjectProperties.JAR_COMPRESS, "false"); // NOI18N diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ProjectEar.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ProjectEar.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ProjectEar.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ProjectEar.java @@ -74,6 +74,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeApplication; import org.netbeans.modules.j2ee.deployment.devmodules.api.ModuleChangeReporter; import org.netbeans.modules.j2ee.deployment.devmodules.api.ModuleListener; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.spi.ArtifactListener; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeApplicationProvider; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeApplicationImplementation; @@ -262,7 +263,7 @@ private Application getDDFromFile() throws IOException { FileObject dd = getDeploymentDescriptor(); if (dd == null) { - dd = EarProjectGenerator.setupDD(project.getJ2eePlatformVersion(), getMetaInf(), project); + dd = EarProjectGenerator.setupDD(project.getJ2eeProfile(), getMetaInf(), project); } return DDProvider.getDefault().getDDRoot(dd); } @@ -348,8 +349,13 @@ return new String[] {}; } + // FIXME mix of two apis public String getJ2eePlatformVersion () { - return project.getJ2eePlatformVersion(); // helper.getStandardPropertyEvaluator ().getProperty (EarProjectProperties.J2EE_PLATFORM); + return project.getJ2eePlatformVersion(); + } + + public Profile getJ2eeProfile() { + return project.getJ2eeProfile(); } @Override diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationMetadataModelImpl.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationMetadataModelImpl.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationMetadataModelImpl.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationMetadataModelImpl.java @@ -133,7 +133,7 @@ && EarProjectUtil.isDDCompulsory(earProject)) { try { ddFO = EarProjectGenerator.setupDD( - earProject.getJ2eePlatformVersion(), + earProject.getJ2eeProfile(), earProject.getAppModule().getMetaInf(), earProject, true); diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java @@ -70,6 +70,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; import org.netbeans.modules.j2ee.earproject.EarProject; @@ -482,16 +483,16 @@ } public void actionPerformed(ActionEvent e) { - String j2eeSpec = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH). - getProperty(EarProjectProperties.J2EE_PLATFORM); - if (j2eeSpec == null) { - j2eeSpec = J2EEProjectProperties.JAVA_EE_5; // NOI18N + Profile j2eeProfile = Profile.fromPropertiesString(helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH). + getProperty(EarProjectProperties.J2EE_PLATFORM)); + if (j2eeProfile == null) { + j2eeProfile = Profile.JAVA_EE_5; Logger.getLogger(J2eeArchiveLogicalViewProvider.class.getName()).warning( "project ["+project.getProjectDirectory()+"] is missing "+EarProjectProperties.J2EE_PLATFORM+". " + // NOI18N - "default value will be used instead: "+j2eeSpec); // NOI18N - updateJ2EESpec(project, project.getAntProjectHelper(), j2eeSpec); + "default value will be used instead: "+j2eeProfile); // NOI18N + updateJ2EESpec(project, project.getAntProjectHelper(), j2eeProfile); } - String instance = BrokenServerSupport.selectServer(j2eeSpec, J2eeModule.EAR); + String instance = BrokenServerSupport.selectServer(j2eeProfile, J2eeModule.EAR); if (instance != null) { EarProjectProperties.setServerInstance( project, helper, instance); @@ -499,12 +500,12 @@ checkMissingServer(); } - private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final String j2eeSpec) { + private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final Profile j2eeProfile) { ProjectManager.mutex().postWriteRequest(new Runnable() { public void run() { try { EditableProperties projectProps = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); - projectProps.put(EarProjectProperties.J2EE_PLATFORM, j2eeSpec); + projectProps.put(EarProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); helper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, projectProps); ProjectManager.getDefault().saveProject(project); } catch (IOException e) { diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle.properties b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle.properties --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle.properties +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle.properties @@ -171,11 +171,6 @@ MSG_AACH_RefToItself=Cannot add reference to itself. MSG_AACH_Cycles=Cannot add cyclic references. -# J2EE Specification levels -J2EESpecLevel_13=J2EE 1.3 -J2EESpecLevel_14=J2EE 1.4 -JavaEESpecLevel_50=Java EE 5 - # EarProjectProperties - modified bulid-impl.xml TXT_Regenerate=

The "build-impl.xml" file was modified externally.


\

The IDE automatically generates this file whenever you edit project
\ diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.form b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.form --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.form +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.form @@ -27,11 +27,8 @@ - - - - - + + @@ -40,7 +37,7 @@ - + @@ -87,7 +84,7 @@ - + @@ -147,7 +144,7 @@ - + @@ -238,10 +235,7 @@ - - - - + diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.java @@ -59,6 +59,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.api.ServerInstance; import org.netbeans.modules.j2ee.earproject.EarProject; import org.netbeans.spi.project.support.ant.AntProjectHelper; @@ -124,11 +125,9 @@ clientModuleUriCombo.setModel(uiProperties.CLIENT_MODULE_MODEL); jCheckBoxDeployOnSave.setModel(uiProperties.DEPLOY_ON_SAVE_MODEL); - String j2eeVersion = uiProperties.getProject().getJ2eePlatformVersion(); - if (J2eeModule.JAVA_EE_5.equals(j2eeVersion)) { - jTextFieldVersion.setText(EarProjectProperties.JAVA_EE_SPEC_50_LABEL); - } else if (J2eeModule.J2EE_14.equals(j2eeVersion)) { - jTextFieldVersion.setText(EarProjectProperties.J2EE_SPEC_14_LABEL); + Profile j2eeProfile = uiProperties.getProject().getJ2eeProfile(); + if (j2eeProfile != null) { + jTextFieldVersion.setText(j2eeProfile.getDisplayName()); } setDeployOnSaveState(); handleWebModuleRelated(); @@ -147,9 +146,8 @@ } private int getLongestVersionLength() { - return Math.max( - EarProjectProperties.JAVA_EE_SPEC_50_LABEL.length(), - EarProjectProperties.J2EE_SPEC_14_LABEL.length()); + // FIXME fix UI to handle the case without this stuff :/ + return Profile.JAVA_EE_6_FULL.getDisplayName().length(); } /** This method is called from within the constructor to diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java @@ -123,11 +123,6 @@ */ public final class EarProjectProperties { - public static final String J2EE_SPEC_14_LABEL = - NbBundle.getMessage(EarProjectProperties.class, "J2EESpecLevel_14"); - public static final String JAVA_EE_SPEC_50_LABEL = - NbBundle.getMessage(EarProjectProperties.class, "JavaEESpecLevel_50"); - // Special properties of the project public static final String WEB_PROJECT_NAME = "web.project.name"; //NOI18N public static final String JAVA_PLATFORM = "platform.active"; //NOI18N diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIterator.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIterator.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIterator.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIterator.java @@ -58,6 +58,7 @@ import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; import org.netbeans.modules.j2ee.common.project.ui.UserProjectSettings; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.EarProjectGenerator; import org.netbeans.modules.j2ee.earproject.ModuleType; import org.openide.WizardDescriptor; @@ -120,7 +121,7 @@ srcF = FileUtil.normalizeFile(srcF); } String name = (String) wiz.getProperty(ProjectLocationWizardPanel.NAME); - String j2eeLevel = (String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); + Profile j2eeProfile = (Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); // String contextPath = (String) wiz.getProperty(WizardProperties.CONTEXT_PATH); String serverInstanceID = (String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID); String platformName = (String)wiz.getProperty(ProjectServerWizardPanel.JAVA_PLATFORM); @@ -131,18 +132,18 @@ String librariesDefinition = SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES)); String serverLibraryName = (String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY); - return testableInstantiate(platformName, sourceLevel, j2eeLevel, dirF, + return testableInstantiate(platformName, sourceLevel, j2eeProfile, dirF, srcF, serverInstanceID, name, userModules, handle, librariesDefinition, serverLibraryName); } /** Package private for unit test only. */ static Set testableInstantiate(final String platformName, - final String sourceLevel, final String j2eeLevel, final File dirF, + final String sourceLevel, final Profile j2eeProfile, final File dirF, final File srcF, final String serverInstanceID, final String name, final Map userModules, ProgressHandle handle, String librariesDefinition, String serverLibraryName) throws IOException { - EarProjectGenerator.importProject(dirF, srcF, name, j2eeLevel, + EarProjectGenerator.importProject(dirF, srcF, name, j2eeProfile, serverInstanceID, platformName, sourceLevel, userModules, librariesDefinition, serverLibraryName); if (handle != null) { diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIterator.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIterator.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIterator.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIterator.java @@ -55,6 +55,7 @@ import org.netbeans.api.progress.ProgressHandle; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; +import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectCreateData; import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectGenerator; import org.netbeans.modules.j2ee.common.SharabilityUtility; import org.netbeans.modules.j2ee.common.project.ui.ProjectLocationWizardPanel; @@ -62,11 +63,13 @@ import org.netbeans.modules.j2ee.common.project.ui.UserProjectSettings; import org.netbeans.modules.j2ee.dd.api.application.Application; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.EarProject; import org.netbeans.modules.j2ee.earproject.EarProjectGenerator; import org.netbeans.modules.j2ee.earproject.ui.customizer.CustomizerRun; import org.netbeans.modules.j2ee.earproject.ui.customizer.EarProjectProperties; import org.netbeans.modules.j2ee.earproject.util.EarProjectUtil; +import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectCreateData; import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectGenerator; import org.netbeans.modules.web.api.webmodule.WebModule; import org.netbeans.modules.web.project.api.WebProjectCreateData; @@ -128,7 +131,7 @@ } String name = (String) wiz.getProperty(ProjectLocationWizardPanel.NAME); String serverInstanceID = (String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID); - String j2eeLevel = (String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); + Profile j2eeLevel = (Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); Boolean createWAR = (Boolean) wiz.getProperty(ProjectServerWizardPanel.CREATE_WAR); String warName = null; if (createWAR.booleanValue()) { @@ -161,12 +164,12 @@ } /** Package private for unit test only. */ - static Set testableInstantiate(File dirF, String name, String j2eeLevel, + static Set testableInstantiate(File dirF, String name, Profile j2eeProfile, String serverInstanceID, String warName, String ejbJarName, String carName, String mainClass, String platformName, String sourceLevel, ProgressHandle handle, String librariesDefinition, String serverLibraryName) throws IOException { Set resultSet = new LinkedHashSet(); - AntProjectHelper h = EarProjectGenerator.createProject(dirF, name, j2eeLevel, + AntProjectHelper h = EarProjectGenerator.createProject(dirF, name, j2eeProfile, serverInstanceID, sourceLevel, librariesDefinition, serverLibraryName); if (handle != null) handle.progress(2); @@ -200,18 +203,19 @@ Project webProject = null; if (null != warName) { File webAppDir = FileUtil.normalizeFile(new File(dirF, warName)); - + WebProjectCreateData createData = new WebProjectCreateData(); createData.setProjectDir(webAppDir); createData.setName(warName); createData.setServerInstanceID(serverInstanceID); createData.setSourceStructure(WebProjectUtilities.SRC_STRUCT_BLUEPRINTS); - createData.setJavaEEVersion(EarProjectGenerator.checkJ2eeVersion(j2eeLevel, serverInstanceID, J2eeModule.WAR)); + createData.setJavaEEProfile(EarProjectGenerator.getAcceptableProfile(j2eeProfile, serverInstanceID, J2eeModule.WAR)); createData.setContextPath('/' + warName); //NOI18N createData.setJavaPlatformName(platformName); createData.setSourceLevel(sourceLevel); createData.setLibrariesDefinition(librariesDefinition); createData.setServerLibraryName(serverLibraryName); + if (handle != null) handle.progress(NbBundle.getMessage(NewEarProjectWizardIterator.class, "LBL_NewEarProjectWizardIterator_WizardProgress_WAR"), 3); AntProjectHelper webHelper = WebProjectUtilities.createProject(createData); @@ -229,12 +233,19 @@ Project appClient = null; if (null != carName) { File carDir = FileUtil.normalizeFile(new File(dirF,carName)); + + AppClientProjectCreateData createData = new AppClientProjectCreateData(); + createData.setProjectDir(carDir); + createData.setName(carName); + createData.setMainClass(mainClass); + createData.setJavaEEProfile(EarProjectGenerator.getAcceptableProfile(j2eeProfile, serverInstanceID, J2eeModule.CLIENT)); + createData.setServerInstanceID(serverInstanceID); + createData.setLibrariesDefinition(librariesDefinition); + createData.setServerLibraryName(serverLibraryName); + if (handle != null) handle.progress(NbBundle.getMessage(NewEarProjectWizardIterator.class, "LBL_NewEarProjectWizardIterator_WizardProgress_AppClient"), 5); - AntProjectHelper clientHelper = AppClientProjectGenerator.createProject( - carDir, carName, mainClass, - EarProjectGenerator.checkJ2eeVersion(j2eeLevel, serverInstanceID, - J2eeModule.CLIENT), serverInstanceID, librariesDefinition, serverLibraryName); + AntProjectHelper clientHelper = AppClientProjectGenerator.createProject(createData); if (handle != null) handle.progress(6); @@ -249,11 +260,18 @@ } if (null != ejbJarName) { File ejbJarDir = FileUtil.normalizeFile(new File(dirF,ejbJarName)); + + EjbJarProjectCreateData createData = new EjbJarProjectCreateData(); + createData.setProjectDir(ejbJarDir); + createData.setName(ejbJarName); + createData.setJavaEEProfile(EarProjectGenerator.getAcceptableProfile(j2eeProfile, serverInstanceID, J2eeModule.EJB)); + createData.setServerInstanceID(serverInstanceID); + createData.setLibrariesDefinition(librariesDefinition); + createData.setServerLibraryName(serverLibraryName); + if (handle != null) handle.progress(NbBundle.getMessage(NewEarProjectWizardIterator.class, "LBL_NewEarProjectWizardIterator_WizardProgress_EJB"), 7); - AntProjectHelper ejbHelper = EjbJarProjectGenerator.createProject(ejbJarDir,ejbJarName, - EarProjectGenerator.checkJ2eeVersion(j2eeLevel, serverInstanceID, J2eeModule.EJB), - serverInstanceID, librariesDefinition, serverLibraryName); + AntProjectHelper ejbHelper = EjbJarProjectGenerator.createProject(createData); if (handle != null) handle.progress(8); diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/dd/ApplicationXmlWizardIterator.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/dd/ApplicationXmlWizardIterator.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/dd/ApplicationXmlWizardIterator.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/dd/ApplicationXmlWizardIterator.java @@ -111,6 +111,7 @@ EarImplementation projectEar = panel.getProject().getLookup().lookup(EarImplementation.class); if (confRoot != null && projectEar != null) { try { + // FIXME mix of two API constants FileObject dd = EarProjectGenerator.setupDD(projectEar.getJ2eePlatformVersion(), projectEar.getMetaInf(), panel.getProject(), true); return Collections.singleton(dd); diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectGeneratorTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectGeneratorTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectGeneratorTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectGeneratorTest.java @@ -48,6 +48,7 @@ import org.netbeans.api.project.ProjectManager; import org.netbeans.junit.NbTestCase; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.test.TestUtil; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.support.ant.EditableProperties; @@ -153,7 +154,7 @@ public void testCreateProjectJavaEE5() throws Exception { File prjDirF = new File(getWorkDir(), "EARProject"); AntProjectHelper aph = EarProjectGenerator.createProject(prjDirF, "test-project", - J2eeModule.JAVA_EE_5, serverID, "1.5", null, null); + Profile.JAVA_EE_5, serverID, "1.5", null, null); assertNotNull(aph); FileObject prjDirFO = aph.getProjectDirectory(); for (String file : CREATED_FILES) { @@ -179,7 +180,7 @@ public void testCreateProjectJ2EE14() throws Exception { File prjDirF = new File(getWorkDir(), "EARProject"); AntProjectHelper aph = EarProjectGenerator.createProject(prjDirF, "test-project", - J2eeModule.J2EE_14, serverID, "1.4", null, null); + Profile.J2EE_14, serverID, "1.4", null, null); assertNotNull(aph); FileObject prjDirFO = aph.getProjectDirectory(); for (String file : CREATED_FILES) { @@ -199,7 +200,7 @@ public void testImportProject() throws Exception { File prjDirF = new File(getWorkDir(), "EARProject"); AntProjectHelper helper = EarProjectGenerator.importProject(prjDirF, prjDirF, - "test-project-ext-src", J2eeModule.JAVA_EE_5, serverID, null, + "test-project-ext-src", Profile.JAVA_EE_5, serverID, null, "1.5", Collections.emptyMap(), null, null); assertNotNull(helper); FileObject prjDirFO = FileUtil.toFileObject(prjDirF); @@ -225,7 +226,7 @@ public void testProjectNameIsSet() throws Exception { // #73930 File prjDirF = new File(getWorkDir(), "EARProject"); EarProjectGenerator.createProject(prjDirF, "test-project", - J2eeModule.JAVA_EE_5, serverID, "1.5", null, null); + Profile.JAVA_EE_5, serverID, "1.5", null, null); // test also build final File buildXML = new File(prjDirF, "build.xml"); String projectName = ProjectManager.mutex().readAccess(new Mutex.ExceptionAction() { @@ -242,7 +243,7 @@ public void testProjectNameIsEscaped() throws Exception { final File prjDirF = new File(getWorkDir(), "EARProject"); EarProjectGenerator.createProject(prjDirF, "test project", - J2eeModule.JAVA_EE_5, serverID, "1.5", null, null); + Profile.JAVA_EE_5, serverID, "1.5", null, null); // test build.xml String buildXmlProjectName = ProjectManager.mutex().readAccess(new Mutex.ExceptionAction() { public String run() throws Exception { diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectTest.java @@ -60,6 +60,7 @@ import org.netbeans.modules.j2ee.dd.api.application.Application; import org.netbeans.modules.j2ee.dd.api.application.DDProvider; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.test.TestUtil; import org.netbeans.modules.j2ee.earproject.ui.wizards.NewEarProjectWizardIteratorTest; import org.netbeans.modules.project.uiapi.ProjectOpenedTrampoline; @@ -94,7 +95,7 @@ public void testEarWithoutDDOpeningJavaEE() throws Exception { File prjDirF = new File(getWorkDir(), "TestEarProject_15"); EarProjectGenerator.createProject(prjDirF, "test-project", - J2eeModule.JAVA_EE_5, serverID, "1.5", null, null); + Profile.JAVA_EE_5, serverID, "1.5", null, null); File dirCopy = copyFolder(prjDirF); File ddF = new File(dirCopy, "src/conf/application.xml"); assertFalse("has no deployment descriptor", ddF.isFile()); @@ -108,7 +109,7 @@ public void testEarWithoutDDOpeningJ2EE() throws Exception { // #75586 File prjDirF = new File(getWorkDir(), "TestEarProject_14"); EarProjectGenerator.createProject(prjDirF, "test-project", - J2eeModule.J2EE_14, serverID, "1.4", null, null); + Profile.J2EE_14, serverID, "1.4", null, null); File dirCopy = copyFolder(prjDirF); File ddF = new File(dirCopy, "src/conf/application.xml"); assertTrue("has deployment descriptor", ddF.isFile()); @@ -124,10 +125,10 @@ public void testThatMissingDDIsNotRegeneratedDuringOpeningJavaEE() throws Exception { File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.JAVA_EE_5; + Profile j2eeProfile = Profile.JAVA_EE_5; String ejbName = "testEA-ejb"; String acName = "testEA-ac"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID, null, ejbName, acName, null, null, null); File dirCopy = copyFolder(earDirF); File ddF = new File(dirCopy, "src/conf/application.xml"); @@ -147,10 +148,10 @@ public void testThatMissingDDIsRegeneratedCorrectlyDuringOpeningJ2EE() throws Exception { // #81154 File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.J2EE_14; + Profile j2eeProfile = Profile.J2EE_14; String ejbName = "testEA-ejb"; String acName = "testEA-ac"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID, null, ejbName, acName, null, null, null); File dirCopy = copyFolder(earDirF); File ddF = new File(dirCopy, "src/conf/application.xml"); @@ -171,10 +172,10 @@ public void testOpeningWihtoutPrivateMetadataAndSrcDirectory() throws Exception { // #83507 File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.JAVA_EE_5; + Profile j2eeProfile = Profile.JAVA_EE_5; String ejbName = "testEA-ejb"; String acName = "testEA-ac"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID, null, ejbName, acName, null, null, null); File dirCopy = copyFolder(earDirF); TestUtil.deleteRec(new File(new File(dirCopy, "nbproject"), "private")); @@ -191,10 +192,10 @@ public void testEarProjectIsGCed() throws Exception { // #83128 File prjDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = "1.4"; + Profile j2eeProfile = Profile.J2EE_14; // creates a project we will use for the import - NewEarProjectWizardIteratorTest.generateEARProject(prjDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(prjDirF, name, j2eeProfile, serverID, null, null, null, null, null, null); Project earProject = ProjectManager.getDefault().findProject(FileUtil.toFileObject(prjDirF)); EarProjectTest.openProject((EarProject) earProject); diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarProviderTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarProviderTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarProviderTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarProviderTest.java @@ -47,6 +47,7 @@ import org.netbeans.junit.NbTestCase; import org.netbeans.modules.j2ee.api.ejbjar.Ear; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.test.TestUtil; import org.netbeans.modules.j2ee.earproject.ui.wizards.NewEarProjectWizardIteratorTest; import org.openide.filesystems.FileObject; @@ -73,9 +74,9 @@ public void testFindEarJavaEE() throws Exception { File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.JAVA_EE_5; + Profile j2eeProfile = Profile.JAVA_EE_5; String ejbName = "testEA-ejb"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, serverID); + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID); FileObject earDirFO = FileUtil.toFileObject(earDirF); Project createdEjbJarProject = ProjectManager.getDefault().findProject(earDirFO); assertNotNull("Ear found", Ear.getEar(earDirFO)); @@ -88,9 +89,9 @@ public void testFindEarJ2EE() throws Exception { File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.J2EE_14; + Profile j2eeProfile = Profile.J2EE_14; String ejbName = "testEA-ejb"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, serverID); + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID); FileObject earDirFO = FileUtil.toFileObject(earDirF); Project createdEjbJarProject = ProjectManager.getDefault().findProject(earDirFO); assertNotNull("Ear found", Ear.getEar(earDirFO)); diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarTest.java @@ -47,6 +47,7 @@ import org.netbeans.modules.j2ee.api.ejbjar.Ear; import org.netbeans.modules.j2ee.dd.api.application.Application; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.test.TestUtil; import org.netbeans.modules.j2ee.earproject.ui.wizards.NewEarProjectWizardIteratorTest; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProject; @@ -75,16 +76,16 @@ // testing project File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.JAVA_EE_5; + Profile j2eeProfile = Profile.JAVA_EE_5; String ejbName = "testEA-ejb"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID, null, ejbName, null, null, null, null); FileObject earDirFO = FileUtil.toFileObject(earDirF); FileObject ejbProjectFO = earDirFO.getFileObject("testEA-ejb"); assertNotNull(ejbProjectFO); File earDirAnotherF = new File(getWorkDir(), "testEA-another"); - NewEarProjectWizardIteratorTest.generateEARProject(earDirAnotherF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(earDirAnotherF, name, j2eeProfile, serverID, null, null, null, null, null, null); FileObject earDirAnotherFO = FileUtil.toFileObject(earDirAnotherF); EjbJarProject createdEjbJarProject = (EjbJarProject) ProjectManager.getDefault().findProject(ejbProjectFO); diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/model/ApplicationImplTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/model/ApplicationImplTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/model/ApplicationImplTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/model/ApplicationImplTest.java @@ -53,6 +53,7 @@ import org.netbeans.modules.j2ee.dd.api.application.ApplicationMetadata; import org.netbeans.modules.j2ee.dd.api.application.Module; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.EarProject; import org.netbeans.modules.j2ee.earproject.classpath.ClassPathSupportCallbackImpl; import org.netbeans.modules.j2ee.earproject.test.TestUtil; @@ -98,8 +99,8 @@ // create project File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.JAVA_EE_5; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, + Profile j2eeProfile = Profile.JAVA_EE_5; + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID, WEB_NAME, EJB_NAME, CAR_NAME, null, null, null); FileObject prjDirFO = FileUtil.toFileObject(earDirF); diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNodeTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNodeTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNodeTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNodeTest.java @@ -45,6 +45,7 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; import org.netbeans.junit.NbTestCase; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.test.TestUtil; import org.netbeans.modules.j2ee.earproject.ui.wizards.NewEarProjectWizardIteratorTest; import org.netbeans.spi.project.ui.LogicalViewProvider; @@ -77,11 +78,11 @@ public void testRemoveFromJarContent() throws Exception { File prjDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = "1.4"; + Profile j2eeProfile = Profile.J2EE_14; String jarName = "testEA-ejb"; // creates a project we will use for the import - NewEarProjectWizardIteratorTest.generateEARProject(prjDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(prjDirF, name, j2eeProfile, serverInstanceID, null, null, jarName, null, null, null); Project earProject = ProjectManager.getDefault().findProject(FileUtil.toFileObject(prjDirF)); @@ -102,11 +103,11 @@ public void testRemoveFromJarContentWithDeletedProject() throws Exception { File prjDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = "1.4"; + Profile j2eeProfile = Profile.J2EE_14; String jarName = "testEA-ejb"; // creates a project we will use for the import - NewEarProjectWizardIteratorTest.generateEARProject(prjDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(prjDirF, name, j2eeProfile, serverInstanceID, null, null, jarName, null, null, null); FileObject prjDirFO = FileUtil.toFileObject(prjDirF); diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectPropertiesTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectPropertiesTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectPropertiesTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectPropertiesTest.java @@ -57,6 +57,7 @@ import org.netbeans.modules.java.api.common.classpath.ClassPathSupport; import org.netbeans.modules.j2ee.dd.api.application.Application; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.EarProject; import org.netbeans.modules.j2ee.earproject.EarProjectGenerator; import org.netbeans.modules.j2ee.earproject.EarProjectTest; @@ -99,10 +100,10 @@ // create project File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.JAVA_EE_5; + Profile j2eeProfile = Profile.JAVA_EE_5; String ejbName = "testEA-ejb"; String carName = "testEA-app-client"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID, null, ejbName, carName, null, null, null); FileObject prjDirFO = FileUtil.toFileObject(earDirF); EarProject project = (EarProject) ProjectManager.getDefault().findProject(prjDirFO); @@ -132,7 +133,7 @@ public void testPropertiesWithoutDDJ2EE() throws Exception { // see #73751 File proj = new File(getWorkDir(), "EARProject"); AntProjectHelper aph = EarProjectGenerator.createProject(proj, - "test-project", J2eeModule.J2EE_14, serverID, "1.4", null, null); + "test-project", Profile.J2EE_14, serverID, "1.4", null, null); FileObject prjDirFO = aph.getProjectDirectory(); // simulateing #73751 prjDirFO.getFileObject("src/conf/application.xml").delete(); @@ -145,7 +146,7 @@ public void testPropertiesWithoutDDJavaEE() throws Exception { File proj = new File(getWorkDir(), "EARProject"); AntProjectHelper aph = EarProjectGenerator.createProject(proj, - "test-project", J2eeModule.JAVA_EE_5, serverID, "1.5", null, null); + "test-project", Profile.JAVA_EE_5, serverID, "1.5", null, null); FileObject prjDirFO = aph.getProjectDirectory(); assertNull("application should not exist", prjDirFO.getFileObject("src/conf/application.xml")); EarProject p = (EarProject)ProjectManager.getDefault().findProject(prjDirFO); @@ -155,18 +156,18 @@ } public void testPathInEARChangingJ2EE() throws Exception { // see #76008 - testPathInEARChanging(J2eeModule.J2EE_14); + testPathInEARChanging(Profile.J2EE_14); } public void testPathInEARChangingJavaEE() throws Exception { // see #76008 - testPathInEARChanging(J2eeModule.JAVA_EE_5); + testPathInEARChanging(Profile.JAVA_EE_5); } - private void testPathInEARChanging(String j2eeLevel) throws Exception { // see #76008 + private void testPathInEARChanging(Profile j2eeProfile) throws Exception { // see #76008 File earDirF = new File(getWorkDir(), "testEA-1"); String name = "Test EnterpriseApplication"; String ejbName = "testEA-ejb"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID, null, ejbName, null, null, null, null); EarProject earProject = (EarProject) ProjectManager.getDefault().findProject(FileUtil.toFileObject(earDirF)); Application app = earProject.getAppModule().getApplication(); @@ -281,7 +282,7 @@ createData.setName(warName); createData.setServerInstanceID(this.serverID); createData.setSourceStructure(WebProjectUtilities.SRC_STRUCT_BLUEPRINTS); - createData.setJavaEEVersion(EarProjectGenerator.checkJ2eeVersion(J2eeModule.JAVA_EE_5, serverID, J2eeModule.WAR)); + createData.setJavaEEProfile(EarProjectGenerator.getAcceptableProfile(Profile.JAVA_EE_5, serverID, J2eeModule.WAR)); createData.setContextPath("/" + warName); AntProjectHelper webHelper = WebProjectUtilities.createProject(createData); diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIteratorTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIteratorTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIteratorTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIteratorTest.java @@ -61,6 +61,7 @@ import org.netbeans.modules.j2ee.dd.api.application.Module; import org.netbeans.modules.j2ee.dd.api.application.Web; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.EarProject; import org.netbeans.modules.j2ee.earproject.EarProjectTest; import org.netbeans.modules.j2ee.earproject.ModuleType; @@ -85,7 +86,7 @@ private static final String CUSTOM_CONTEXT_ROOT = "/my-context-root"; private String name; - private String j2eeLevel; + private Profile j2eeProfile; private String warName; private String jarName; private String carName; @@ -103,7 +104,7 @@ private void setDefaultValues() { name = "Test EnterpriseApplication"; - j2eeLevel = J2eeModule.JAVA_EE_5; + j2eeProfile = Profile.JAVA_EE_5; warName = "testEA-war"; jarName = "testEA-ejb"; carName = "testEA-app-client"; @@ -127,11 +128,11 @@ } public void testTestableInstantiateBasics() throws Exception { - j2eeLevel = J2eeModule.JAVA_EE_5; + j2eeProfile = Profile.JAVA_EE_5; generateJ2EEApplication(false); File importedDir = new File(getWorkDir(), "testEA-imported"); ImportBlueprintEarWizardIterator.testableInstantiate(platformName, sourceLevel, - j2eeLevel, importedDir, prjDirF, serverInstanceID, name, + j2eeProfile, importedDir, prjDirF, serverInstanceID, name, Collections.emptyMap(), null, null, null); FileObject fo = FileUtil.toFileObject(importedDir); @@ -141,7 +142,7 @@ } public void testTestableInstantiateWitoutDD() throws Exception { - j2eeLevel = J2eeModule.J2EE_14; + j2eeProfile = Profile.J2EE_14; FileObject prjDirFO = generateJ2EEApplication(true); // and Enterprise Application's deployment descriptor @@ -153,7 +154,7 @@ userModules.put(prjDirFO.getFileObject(carName), ModuleType.CLIENT); File importedDir = new File(getWorkDir(), "testEA-imported"); ImportBlueprintEarWizardIterator.testableInstantiate(platformName, sourceLevel, - j2eeLevel, importedDir, prjDirF, serverInstanceID, name, userModules, null, null, null); + j2eeProfile, importedDir, prjDirF, serverInstanceID, name, userModules, null, null, null); FileObject importedDirFO = FileUtil.toFileObject(importedDir); FileObject ddFO = prjDirFO.getFileObject("src/conf/application.xml"); @@ -166,12 +167,12 @@ } public void testTestableInstantiateWithWebAndEJBAndAC() throws Exception { - j2eeLevel = J2eeModule.J2EE_14; + j2eeProfile = Profile.J2EE_14; FileObject prjDirFO = generateJ2EEApplication(true); File importedDir = new File(getWorkDir(), "testEA-imported"); ImportBlueprintEarWizardIterator.testableInstantiate(platformName, sourceLevel, - j2eeLevel, importedDir, prjDirF, serverInstanceID, name, + j2eeProfile, importedDir, prjDirF, serverInstanceID, name, Collections.emptyMap(), null, null, null); assertNotNull("have a backup copy of application.xml", prjDirFO.getFileObject("src/conf/original_application.xml")); @@ -191,12 +192,12 @@ // temporarily(?) turned off public void off_testWebContextRootIsSet() throws Exception { - this.j2eeLevel = "1.4"; + this.j2eeProfile = Profile.J2EE_14; generateJ2EEApplicationWithWeb(); File importedDir = new File(getWorkDir(), "testEA-imported"); ImportBlueprintEarWizardIterator.testableInstantiate(platformName, sourceLevel, - j2eeLevel, importedDir, prjDirF, serverInstanceID, name, + j2eeProfile, importedDir, prjDirF, serverInstanceID, name, Collections.emptyMap(), null, null, null); String importedContextRoot = null; @@ -220,7 +221,7 @@ private FileObject generateJ2EEApplication() throws Exception { // creates a project we will use for the import NewEarProjectWizardIteratorTest.generateEARProject( - prjDirF, name, j2eeLevel, serverInstanceID, + prjDirF, name, j2eeProfile, serverInstanceID, warName, jarName, carName, mainClass, platformName, sourceLevel); // Workaround. Set the context root which should be set automatically. diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIteratorTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIteratorTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIteratorTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIteratorTest.java @@ -52,6 +52,7 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; import org.netbeans.junit.NbTestCase; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.EarProject; import org.netbeans.modules.j2ee.earproject.EarProjectTest; import org.netbeans.modules.j2ee.earproject.TestPlatformProvider; @@ -78,12 +79,12 @@ * May be used for generating project instances in tests. */ public static void generateEARProject( - File prjDirF, String name, String j2eeLevel, + File prjDirF, String name, Profile j2eeProfile, String serverInstanceID, String warName, String jarName, String carName, String mainClass, String platformName, String sourceLevel) throws IOException { NewEarProjectWizardIterator.testableInstantiate(prjDirF, name, - j2eeLevel, serverInstanceID, warName, jarName, + j2eeProfile, serverInstanceID, warName, jarName, carName, mainClass, platformName, sourceLevel, null, null, null); } @@ -94,8 +95,8 @@ * @see #generateEARProject(File, String, String, String, String, String, String, String, String, String) */ public static void generateEARProject(File earDirF, String name, - String j2eeLevel, String serverID) throws IOException { - generateEARProject(earDirF, name, j2eeLevel, serverID, null, null, null, + Profile j2eeProfile, String serverID) throws IOException { + generateEARProject(earDirF, name, j2eeProfile, serverID, null, null, null, null, null, null); } @@ -122,7 +123,7 @@ public void testTestableInstantiate() throws Exception { File dirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = "1.4"; + Profile j2eeProfile = Profile.J2EE_14; String warName = null; String jarName = null; String carName = null; @@ -131,7 +132,7 @@ String sourceLevel = null; Set result = NewEarProjectWizardIterator.testableInstantiate(dirF, name, - j2eeLevel, serverInstanceID, warName, jarName, + j2eeProfile, serverInstanceID, warName, jarName, carName, mainClass, platformName, sourceLevel, null, null, null); Set expResult = new HashSet(); @@ -150,7 +151,7 @@ assertNotNull("application client registered", FileUtil.getConfigFile(resource)); File dirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = "1.4"; + Profile j2eeProfile = Profile.J2EE_14; String warName = null; String jarName = null; String carName = "testEA-app-client"; @@ -159,7 +160,7 @@ String sourceLevel = null; Set result = NewEarProjectWizardIterator.testableInstantiate(dirF, name, - j2eeLevel, serverInstanceID, warName, jarName, + j2eeProfile, serverInstanceID, warName, jarName, carName, mainClass, platformName, sourceLevel, null, null, null); Set expResult = new HashSet(); @@ -182,7 +183,7 @@ assertNotNull("application client registered", FileUtil.getConfigFile(resource)); File dirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = "1.4"; + Profile j2eeProfile = Profile.J2EE_14; String warName = "testEA-war"; String jarName = "testEA-ejb"; String carName = "testEA-app-client"; @@ -191,7 +192,7 @@ String sourceLevel = null; Set result = NewEarProjectWizardIterator.testableInstantiate(dirF, name, - j2eeLevel, serverInstanceID, warName, jarName, + j2eeProfile, serverInstanceID, warName, jarName, carName, mainClass, platformName, sourceLevel, null, null, null); Set expResult = new HashSet(); diff --git a/j2ee.ejbjarproject/manifest.mf b/j2ee.ejbjarproject/manifest.mf --- a/j2ee.ejbjarproject/manifest.mf +++ b/j2ee.ejbjarproject/manifest.mf @@ -2,6 +2,6 @@ OpenIDE-Module: org.netbeans.modules.j2ee.ejbjarproject OpenIDE-Module-Layer: org/netbeans/modules/j2ee/ejbjarproject/ui/resources/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/ejbjarproject/Bundle.properties -OpenIDE-Module-Specification-Version: 1.15 +OpenIDE-Module-Specification-Version: 1.16 AutoUpdate-Show-In-Client: false diff --git a/j2ee.ejbjarproject/nbproject/project.xml b/j2ee.ejbjarproject/nbproject/project.xml --- a/j2ee.ejbjarproject/nbproject/project.xml +++ b/j2ee.ejbjarproject/nbproject/project.xml @@ -155,7 +155,7 @@ 1 - 1.36 + 1.38 @@ -214,7 +214,7 @@ 4 - 1.53 + 1.58 diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarPersistenceProvider.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarPersistenceProvider.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarPersistenceProvider.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarPersistenceProvider.java @@ -52,6 +52,7 @@ import org.netbeans.api.java.classpath.ClassPath; import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Capabilities; import org.netbeans.modules.java.api.common.classpath.ClassPathProviderImpl; import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; @@ -222,18 +223,7 @@ } public boolean supportsDefaultProvider() { - J2eeModuleProvider j2eeModuleProvider = project.getLookup().lookup(J2eeModuleProvider.class); - J2eePlatform platform = Deployment.getDefault().getJ2eePlatform(j2eeModuleProvider.getServerInstanceID()); - - if (platform == null){ - // server probably not registered, can't resolve whether default provider is supported (see #79856) - return false; - } - - Set supportedVersions = platform.getSupportedSpecVersions(j2eeModuleProvider.getJ2eeModule().getModuleType()); - - return supportedVersions.contains(J2eeModule.JAVA_EE_5) - && platform.isToolSupported("defaultPersistenceProviderJavaEE5"); // NOI18N + return Capabilities.forProject(project).hasDefaultPersistenceProvider(); } /** diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProvider.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProvider.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProvider.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProvider.java @@ -57,6 +57,7 @@ import org.netbeans.api.project.SourceGroup; import org.netbeans.api.project.Sources; import org.netbeans.api.project.ui.OpenProjects; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.java.api.common.classpath.ClassPathProviderImpl; import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties; import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider; @@ -84,6 +85,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.api.ModuleChangeReporter; +import org.netbeans.modules.j2ee.ejbjarproject.ui.customizer.EjbJarCompositePanelProvider; import org.netbeans.modules.java.api.common.project.ProjectProperties; import org.netbeans.modules.websvc.spi.webservices.WebServicesConstants; @@ -121,7 +123,7 @@ if (metaInfFo != null) { ddFO = metaInfFo.getFileObject(FILE_DD); } - if (ddFO == null && !J2EEProjectProperties.JAVA_EE_5.equals(getJ2eePlatformVersion())) { + if (ddFO == null && !EjbProjectConstants.JAVA_EE_5_LEVEL.equals(getJ2eePlatformVersion())) { // ...generate the DD from template... } return ddFO; @@ -160,8 +162,8 @@ /** Package-private for unit test only. */ static boolean needConfigurationFolder(final String version) { - return J2EEProjectProperties.J2EE_1_3.equals(version) || - J2EEProjectProperties.J2EE_1_4.equals(version); + return EjbProjectConstants.J2EE_13_LEVEL.equals(version) || + EjbProjectConstants.J2EE_14_LEVEL.equals(version); } public File getMetaInfAsFile() { diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectCreateData.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectCreateData.java new file mode 100644 --- /dev/null +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectCreateData.java @@ -0,0 +1,154 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.j2ee.ejbjarproject.api; + +import java.io.File; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; + +/** + * + * @author Petr Hejl + */ +public final class EjbJarProjectCreateData { + + private File projectDir; + + private String name; + + private Profile javaEEProfile; + + private String serverInstanceID; + + private String librariesDefinition; + + private String serverLibraryName; + + private File[] sourceFolders; + + private File[] testFolders; + + private File configFilesBase; + + private File libFolder; + + public EjbJarProjectCreateData() { + } + + public Profile getJavaEEProfile() { + return javaEEProfile; + } + + public void setJavaEEProfile(Profile javaEEProfile) { + this.javaEEProfile = javaEEProfile; + } + + public String getLibrariesDefinition() { + return librariesDefinition; + } + + public void setLibrariesDefinition(String librariesDefinition) { + this.librariesDefinition = librariesDefinition; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public File getProjectDir() { + return projectDir; + } + + public void setProjectDir(File projectDir) { + this.projectDir = projectDir; + } + + public String getServerInstanceID() { + return serverInstanceID; + } + + public void setServerInstanceID(String serverInstanceID) { + this.serverInstanceID = serverInstanceID; + } + + public String getServerLibraryName() { + return serverLibraryName; + } + + public void setServerLibraryName(String serverLibraryName) { + this.serverLibraryName = serverLibraryName; + } + + public File getConfigFilesBase() { + return configFilesBase; + } + + public void setConfigFilesBase(File configFilesBase) { + this.configFilesBase = configFilesBase; + } + + public File getLibFolder() { + return libFolder; + } + + public void setLibFolder(File libFolder) { + this.libFolder = libFolder; + } + + public File[] getSourceFolders() { + return sourceFolders; + } + + public void setSourceFolders(File[] sourceFolders) { + this.sourceFolders = sourceFolders; + } + + public File[] getTestFolders() { + return testFolders; + } + + public void setTestFolders(File[] testFolders) { + this.testFolders = testFolders; + } + +} diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectGenerator.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectGenerator.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectGenerator.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectGenerator.java @@ -61,7 +61,6 @@ import org.netbeans.api.project.libraries.LibraryManager; import org.netbeans.api.queries.FileEncodingQuery; import org.netbeans.modules.j2ee.common.SharabilityUtility; -import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.support.ant.EditableProperties; import org.netbeans.spi.project.support.ant.ProjectGenerator; @@ -70,6 +69,7 @@ import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProject; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProjectType; import org.netbeans.modules.j2ee.ejbjarproject.Utils; @@ -116,33 +116,51 @@ * @param serverInstanceID server instance ID * @return the helper object permitting it to be further customized * @throws IOException in case something went wrong + * @deprecated */ public static AntProjectHelper createProject(File dir, final String name, final String j2eeLevel, final String serverInstanceID) throws IOException { return createProject(dir, name, j2eeLevel, serverInstanceID, null, null); } - + + @Deprecated public static AntProjectHelper createProject(File dir, final String name, final String j2eeLevel, final String serverInstanceID, final String librariesDefinition, final String serverLibraryName) throws IOException { + + EjbJarProjectCreateData createData = new EjbJarProjectCreateData(); + createData.setProjectDir(dir); + createData.setName(name); + createData.setJavaEEProfile(Profile.fromPropertiesString(j2eeLevel)); + createData.setServerInstanceID(serverInstanceID); + createData.setLibrariesDefinition(librariesDefinition); + createData.setServerLibraryName(serverLibraryName); + return createProject(createData); + } + + public static AntProjectHelper createProject(final EjbJarProjectCreateData createData) throws IOException { + File dir = createData.getProjectDir(); + final FileObject projectDir = FileUtil.createFolder(dir); final AntProjectHelper[] h = new AntProjectHelper[1]; - + // create project in one FS atomic action: FileSystem fs = projectDir.getFileSystem(); fs.runAtomicAction(new FileSystem.AtomicAction() { public void run() throws IOException { - AntProjectHelper helper = createProjectImpl(projectDir, name, - j2eeLevel, serverInstanceID, librariesDefinition, serverLibraryName); + AntProjectHelper helper = createProjectImpl(createData, projectDir); h[0] = helper; }}); return h[0]; } - private static AntProjectHelper createProjectImpl(FileObject projectDir, String name, - String j2eeLevel, final String serverInstanceID, final String librariesDefinition, final String serverLibraryName) throws IOException { - + private static AntProjectHelper createProjectImpl(final EjbJarProjectCreateData createData, + final FileObject projectDir) throws IOException { + + String name = createData.getName(); + String serverInstanceID = createData.getServerInstanceID(); + FileObject srcRoot = projectDir.createFolder(DEFAULT_SRC_FOLDER); // NOI18N srcRoot.createFolder(DEFAULT_JAVA_FOLDER); //NOI18N projectDir.createFolder(DEFAULT_TEST_FOLDER); @@ -151,12 +169,12 @@ //create a default manifest FileUtil.copyFile(FileUtil.getConfigFile("org-netbeans-modules-j2ee-ejbjarproject/MANIFEST.MF"), confRoot, "MANIFEST"); //NOI18N - final String realServerLibraryName = configureServerLibrary(librariesDefinition, - serverInstanceID, projectDir, serverLibraryName != null); + final String realServerLibraryName = configureServerLibrary(createData.getLibrariesDefinition(), + serverInstanceID, projectDir, createData.getServerLibraryName() != null); final AntProjectHelper h = setupProject(projectDir, name, - "src", "test", null, null, null, j2eeLevel, serverInstanceID, - librariesDefinition, realServerLibraryName); + "src", "test", null, null, null, createData.getJavaEEProfile(), serverInstanceID, + createData.getLibrariesDefinition(), realServerLibraryName); EditableProperties ep = h.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); ep.put(EjbJarProjectProperties.SOURCE_ROOT, DEFAULT_SRC_FOLDER); //NOI18N @@ -174,7 +192,7 @@ try { ProjectManager.mutex().writeAccess(new Mutex.ExceptionAction() { public Void run() throws Exception { - copyRequiredLibraries(h, refHelper, serverInstanceID, serverLibraryName); + copyRequiredLibraries(h, refHelper, createData); return null; } }); @@ -183,7 +201,7 @@ } // create ejb-jar.xml - if (!J2eeModule.JAVA_EE_5.equals(j2eeLevel)) { + if (!Profile.JAVA_EE_5.equals(createData.getJavaEEProfile())) { String resource = "org-netbeans-modules-j2ee-ejbjarproject/ejb-jar-2.1.xml"; FileObject ddFile = FileUtil.copyFile(FileUtil.getConfigFile(resource), confRoot, "ejb-jar"); //NOI18N EjbJar ejbJar = DDProvider.getDefault().getDDRoot(ddFile); @@ -235,7 +253,8 @@ ProjectManager.getDefault().saveProject(subP); return retVal; } - + + @Deprecated public static AntProjectHelper importProject(final File dir, final String name, final File[] sourceFolders, final File[] testFolders, final File configFilesBase, final File libFolder, final String j2eeLevel, @@ -244,46 +263,68 @@ return importProject(dir, name, sourceFolders, testFolders, configFilesBase, libFolder, j2eeLevel, serverInstanceID, null, null); } - + + @Deprecated public static AntProjectHelper importProject(final File dir, final String name, final File[] sourceFolders, final File[] testFolders, final File configFilesBase, final File libFolder, final String j2eeLevel, final String serverInstanceID, final String librariesDefinition, final String serverLibraryName) throws IOException { + + EjbJarProjectCreateData createData = new EjbJarProjectCreateData(); + createData.setProjectDir(dir); + createData.setName(name); + createData.setSourceFolders(sourceFolders); + createData.setTestFolders(testFolders); + createData.setConfigFilesBase(configFilesBase); + createData.setLibFolder(libFolder); + createData.setJavaEEProfile(Profile.fromPropertiesString(j2eeLevel)); + createData.setServerInstanceID(serverInstanceID); + createData.setLibrariesDefinition(librariesDefinition); + createData.setServerLibraryName(serverLibraryName); + return importProject(createData); + } + + public static AntProjectHelper importProject(final EjbJarProjectCreateData createData) throws IOException { + File dir = createData.getProjectDir(); + assert dir != null: "Project folder can't be null"; //NOI18N final FileObject projectDir = FileUtil.createFolder(dir); final AntProjectHelper[] h = new AntProjectHelper[1]; - + // create project in one FS atomic action: FileSystem fs = projectDir.getFileSystem(); fs.runAtomicAction(new FileSystem.AtomicAction() { public void run() throws IOException { - AntProjectHelper helper = importProjectImpl(projectDir, name, sourceFolders, testFolders, - configFilesBase, libFolder, j2eeLevel, serverInstanceID, librariesDefinition, serverLibraryName); + AntProjectHelper helper = importProjectImpl(createData, projectDir); h[0] = helper; }}); return h[0]; - } + } - private static AntProjectHelper importProjectImpl(final FileObject projectDir, final String name, - final File[] sourceFolders, final File[] testFolders, - final File configFilesBase, final File libFolder, final String j2eeLevel, - final String serverInstanceID, String librariesDefinition, final String serverLibraryName) throws IOException { - + private static AntProjectHelper importProjectImpl(final EjbJarProjectCreateData createData, + final FileObject projectDir) throws IOException { + + String name = createData.getName(); + final File[] sourceFolders = createData.getSourceFolders(); + final File[] testFolders = createData.getTestFolders(); + Profile j2eeProfile = createData.getJavaEEProfile(); + String serverInstanceID = createData.getServerInstanceID(); + assert sourceFolders != null && testFolders != null: "Package roots can't be null"; //NOI18N // this constructor creates only java application type - final String realServerLibraryName = configureServerLibrary(librariesDefinition, - serverInstanceID, projectDir, serverLibraryName != null); + final String realServerLibraryName = configureServerLibrary(createData.getLibrariesDefinition(), + serverInstanceID, projectDir, createData.getServerLibraryName() != null); final AntProjectHelper h = setupProject(projectDir, name, null, null, - configFilesBase, - (libFolder == null ? null : libFolder), + createData.getConfigFilesBase(), + createData.getLibFolder(), null, - j2eeLevel, + j2eeProfile, serverInstanceID, - librariesDefinition, + createData.getLibrariesDefinition(), realServerLibraryName); final EjbJarProject p = (EjbJarProject) ProjectManager.getDefault().findProject(projectDir); @@ -330,7 +371,7 @@ } } h.putPrimaryConfigurationData(data,true); - copyRequiredLibraries(h, refHelper, serverInstanceID, serverLibraryName); + copyRequiredLibraries(h, refHelper, createData); ProjectManager.getDefault().saveProject(p); return null; } @@ -342,12 +383,12 @@ } // AB: fix for #53170: if j2eeLevel is 1.4 and ejb-jar.xml is version 2.0, we upgrade it to version 2.1 - FileObject ejbJarXml = FileUtil.toFileObject(configFilesBase).getFileObject("ejb-jar.xml"); // NOI18N + FileObject ejbJarXml = FileUtil.toFileObject(createData.getConfigFilesBase()).getFileObject("ejb-jar.xml"); // NOI18N if (ejbJarXml != null) { try { EjbJar root = DDProvider.getDefault().getDDRoot(ejbJarXml); boolean writeDD = false; - if (new BigDecimal(EjbJar.VERSION_2_0).equals(root.getVersion()) && j2eeLevel.equals(J2EEProjectProperties.J2EE_1_4)) { // NOI18N + if (new BigDecimal(EjbJar.VERSION_2_0).equals(root.getVersion()) && Profile.J2EE_14.equals(j2eeProfile)) { // NOI18N root.setVersion(new BigDecimal(EjbJar.VERSION_2_1)); writeDD = true; } @@ -367,8 +408,7 @@ return h; } - private static void copyRequiredLibraries(AntProjectHelper h, ReferenceHelper rh, - String serverInstanceId, String serverlibraryName) throws IOException { + private static void copyRequiredLibraries(AntProjectHelper h, ReferenceHelper rh, EjbJarProjectCreateData data) throws IOException { if (!h.isSharableProject()) { return; @@ -422,7 +462,7 @@ private static AntProjectHelper setupProject(FileObject dirFO, String name, String srcRoot, String testRoot, File configFiles, File libraries, String resources, - String j2eeLevel, String serverInstanceID, String librariesDefinition, String serverLibraryName) throws IOException { + Profile j2eeProfile, String serverInstanceID, String librariesDefinition, String serverLibraryName) throws IOException { Utils.logUI(NbBundle.getBundle(EjbJarProjectGenerator.class), "UI_EJB_PROJECT_CREATE_SHARABILITY", // NOI18N new Object[]{Boolean.valueOf(librariesDefinition != null), Boolean.valueOf(serverLibraryName != null)}); @@ -484,7 +524,7 @@ ep.setProperty(EjbJarProjectProperties.DIST_JAR, "${"+EjbJarProjectProperties.DIST_DIR+"}/" + "${" + EjbJarProjectProperties.JAR_NAME + "}"); //XXX the name of the dist.ear.jar file should be different, but now it cannot be since the name is used as a key in module provider mapping ep.setProperty(EjbJarProjectProperties.DIST_EAR_JAR, "${"+EjbJarProjectProperties.DIST_DIR+"}/" + "${" + EjbJarProjectProperties.JAR_NAME + "}"); - ep.setProperty(EjbJarProjectProperties.J2EE_PLATFORM, j2eeLevel); + ep.setProperty(EjbJarProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); ep.setProperty(EjbJarProjectProperties.JAR_NAME, PropertyUtils.getUsablePropertyName(name) + ".jar"); ep.setProperty(EjbJarProjectProperties.JAR_COMPRESS, "false"); // ep.setProperty(EjbJarProjectProperties.JAR_CONTENT_ADDITIONAL, ""); @@ -581,9 +621,9 @@ // set j2ee.platform.classpath J2eePlatform j2eePlatform = Deployment.getDefault().getJ2eePlatform(serverInstanceID); - if (!j2eePlatform.getSupportedSpecVersions(J2eeModule.EJB).contains(j2eeLevel)) { + if (!j2eePlatform.getSupportedProfiles(J2eeModule.EJB).contains(j2eeProfile)) { Logger.getLogger("global").log(Level.WARNING, - "J2EE level:" + j2eeLevel + " not supported by server " + Deployment.getDefault().getServerInstanceDisplayName(serverInstanceID) + " for module type EJB"); // NOI18N + "J2EE level:" + j2eeProfile + " not supported by server " + Deployment.getDefault().getServerInstanceDisplayName(serverInstanceID) + " for module type EJB"); // NOI18N } if (!h.isSharableProject() || serverLibraryName == null) { diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbJarLogicalViewProvider.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbJarLogicalViewProvider.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbJarLogicalViewProvider.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbJarLogicalViewProvider.java @@ -92,6 +92,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProject; import org.netbeans.modules.j2ee.spi.ejbjar.support.J2eeProjectView; @@ -477,15 +478,15 @@ } public void actionPerformed(ActionEvent e) { - String j2eeSpec = project.evaluator().getProperty(EjbJarProjectProperties.J2EE_PLATFORM); - if (j2eeSpec == null) { - j2eeSpec = J2EEProjectProperties.JAVA_EE_5; // NOI18N + Profile j2eeProfile = Profile.fromPropertiesString(project.evaluator().getProperty(EjbJarProjectProperties.J2EE_PLATFORM)); + if (j2eeProfile == null) { + j2eeProfile = Profile.JAVA_EE_5; Logger.getLogger(EjbJarLogicalViewProvider.class.getName()).warning( "project ["+project.getProjectDirectory()+"] is missing "+EjbJarProjectProperties.J2EE_PLATFORM+". " + // NOI18N - "default value will be used instead: "+j2eeSpec); // NOI18N - updateJ2EESpec(project, project.getAntProjectHelper(), j2eeSpec); + "default value will be used instead: "+j2eeProfile); // NOI18N + updateJ2EESpec(project, project.getAntProjectHelper(), j2eeProfile); } - String instance = BrokenServerSupport.selectServer(j2eeSpec, J2eeModule.EJB); + String instance = BrokenServerSupport.selectServer(j2eeProfile, J2eeModule.EJB); if (instance != null) { EjbJarProjectProperties.setServerInstance( project, helper, instance); @@ -493,12 +494,12 @@ checkMissingServer(); } - private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final String j2eeSpec) { + private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final Profile j2eeProfile) { ProjectManager.mutex().postWriteRequest(new Runnable() { public void run() { try { EditableProperties projectProps = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); - projectProps.put(EjbJarProjectProperties.J2EE_PLATFORM, j2eeSpec); + projectProps.put(EjbJarProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); helper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, projectProps); ProjectManager.getDefault().saveProject(project); } catch (IOException e) { diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarCompositePanelProvider.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarCompositePanelProvider.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarCompositePanelProvider.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarCompositePanelProvider.java @@ -45,6 +45,7 @@ import java.util.ResourceBundle; import javax.swing.JComponent; import javax.swing.JPanel; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProject; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProvider; @@ -193,7 +194,7 @@ private static boolean showWebServicesCategory(EjbJarProjectProperties uiProperties) { EjbJarProject project = (EjbJarProject) uiProperties.getProject(); - if(J2EEProjectProperties.J2EE_1_4.equals(project.getEjbModule().getJ2eePlatformVersion())) { + if(EjbProjectConstants.J2EE_14_LEVEL.equals(project.getEjbModule().getJ2eePlatformVersion())) { return WebServicesSupport.getWebServicesSupport(project.getProjectDirectory())!=null; } return false; diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarProjectProperties.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarProjectProperties.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarProjectProperties.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarProjectProperties.java @@ -91,6 +91,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProject; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProjectType; import org.netbeans.modules.j2ee.ejbjarproject.Utils; @@ -313,8 +314,8 @@ PLATFORM_MODEL = PlatformUiSupport.createPlatformComboBoxModel (evaluator.getProperty(JAVA_PLATFORM)); PLATFORM_LIST_RENDERER = PlatformUiSupport.createPlatformListCellRenderer(); SpecificationVersion minimalSourceLevel = null; - if (J2EEProjectProperties.JAVA_EE_5.equals(evaluator.getProperty(J2EE_PLATFORM))) { - minimalSourceLevel = new SpecificationVersion(J2EEProjectProperties.JAVA_EE_5); + if (Profile.JAVA_EE_5.equals(Profile.fromPropertiesString(evaluator.getProperty(J2EE_PLATFORM)))) { + minimalSourceLevel = new SpecificationVersion("1.5"); } JAVAC_SOURCE_MODEL = PlatformUiSupport.createSourceLevelComboBoxModel (PLATFORM_MODEL, evaluator.getProperty(JAVAC_SOURCE), evaluator.getProperty(JAVAC_TARGET), minimalSourceLevel); JAVAC_SOURCE_RENDERER = PlatformUiSupport.createSourceLevelListCellRenderer (); @@ -474,10 +475,10 @@ } // Update the deployment descriptor if upgrading from J2EE 1.3 to 1.4 and set the new J2EE spec version - String oldJ2eeVersion = projectProperties.getProperty(J2EE_PLATFORM); - String newJ2eeVersion = J2eePlatformUiSupport.getSpecVersion(J2EE_PLATFORM_MODEL.getSelectedItem()); + Profile oldJ2eeVersion = Profile.fromPropertiesString(projectProperties.getProperty(J2EE_PLATFORM)); + Profile newJ2eeVersion = J2eePlatformUiSupport.getJavaEEProfile(J2EE_PLATFORM_MODEL.getSelectedItem()); if (oldJ2eeVersion != null && newJ2eeVersion != null) { - if (oldJ2eeVersion.equals(J2EEProjectProperties.J2EE_1_3) && newJ2eeVersion.equals(J2EEProjectProperties.J2EE_1_4)) { + if (oldJ2eeVersion.equals(Profile.J2EE_13) && newJ2eeVersion.equals(Profile.J2EE_14)) { org.netbeans.modules.j2ee.api.ejbjar.EjbJar ejbJarModules[] = org.netbeans.modules.j2ee.api.ejbjar.EjbJar.getEjbJars(project); if (ejbJarModules.length > 0) { FileObject ddFo = ejbJarModules[0].getDeploymentDescriptor(); @@ -492,7 +493,7 @@ } // Set the new J2EE spec version - projectProperties.setProperty(J2EE_PLATFORM, newJ2eeVersion); + projectProperties.setProperty(J2EE_PLATFORM, newJ2eeVersion.toPropertiesString()); } projectProperties.putAll(additionalProperties); diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/Bundle.properties b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/Bundle.properties --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/Bundle.properties +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/Bundle.properties @@ -85,10 +85,6 @@ LBL_NWP1_AddToEApp_CheckBox=Add to Enterprise &Application\: -J2EESpecLevel_15=Java EE 5 -J2EESpecLevel_14=J2EE 1.4 -J2EESpecLevel_13=J2EE 1.3 - J2EESpecLevel_Desc_14=J2EE 1.4 includes EJB specification 2.1.\n\nThis specification level is supported by servers like Sun Java System Application Server Platform Edition 8 LBL_NWP1_SetAsMain_CheckBoxMnemonic=M diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/ImportEjbJarProjectWizardIterator.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/ImportEjbJarProjectWizardIterator.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/ImportEjbJarProjectWizardIterator.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/ImportEjbJarProjectWizardIterator.java @@ -65,11 +65,13 @@ import org.netbeans.modules.j2ee.common.project.ui.ProjectLocationWizardPanel; import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProject; import org.openide.util.NbBundle; import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectGenerator; import org.netbeans.modules.j2ee.ejbjarproject.Utils; +import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectCreateData; import org.netbeans.spi.project.support.ant.AntProjectHelper; @@ -127,15 +129,25 @@ File configFilesFolder = (File) wiz.getProperty(WizardProperties.CONFIG_FILES_FOLDER); File libName = (File) wiz.getProperty(WizardProperties.LIB_FOLDER); String serverInstanceID = (String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID); - String j2eeLevel = (String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); + Profile j2eeProfile = (Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); String librariesDefinition = SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES)); String serverLibraryName = (String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY); - - AntProjectHelper h = EjbJarProjectGenerator.importProject(dirF, name, - sourceFolders, testFolders, configFilesFolder, libName, - j2eeLevel, serverInstanceID, librariesDefinition, serverLibraryName); + + EjbJarProjectCreateData createData = new EjbJarProjectCreateData(); + createData.setProjectDir(dirF); + createData.setName(name); + createData.setSourceFolders(sourceFolders); + createData.setTestFolders(testFolders); + createData.setConfigFilesBase(configFilesFolder); + createData.setLibFolder(libName); + createData.setServerInstanceID(serverInstanceID); + createData.setJavaEEProfile(j2eeProfile); + createData.setLibrariesDefinition(librariesDefinition); + createData.setServerLibraryName(serverLibraryName); + + AntProjectHelper h = EjbJarProjectGenerator.importProject(createData); handle.progress(2); FileObject dir = FileUtil.toFileObject (dirF); diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/NewEjbJarProjectWizardIterator.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/NewEjbJarProjectWizardIterator.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/NewEjbJarProjectWizardIterator.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/NewEjbJarProjectWizardIterator.java @@ -59,6 +59,7 @@ import org.netbeans.modules.j2ee.common.project.ui.ProjectLocationWizardPanel; import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProject; import org.netbeans.spi.project.support.ant.AntProjectHelper; @@ -68,6 +69,7 @@ import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectGenerator; import org.netbeans.modules.j2ee.ejbjarproject.Utils; +import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectCreateData; import org.netbeans.spi.java.project.support.ui.SharableLibrariesUtils; import org.netbeans.spi.project.ui.support.ProjectChooser; import org.openide.util.NbBundle; @@ -113,15 +115,17 @@ if (dirF != null) { dirF = FileUtil.normalizeFile(dirF); } - String name = (String) wiz.getProperty(ProjectLocationWizardPanel.NAME); - String serverInstanceID = (String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID); - String j2eeLevel = (String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); - String librariesDefinition = - SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES)); - String serverLibraryName = (String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY); - AntProjectHelper h = EjbJarProjectGenerator.createProject(dirF, name, - j2eeLevel, serverInstanceID, librariesDefinition, serverLibraryName); + EjbJarProjectCreateData createData = new EjbJarProjectCreateData(); + createData.setProjectDir(dirF); + createData.setName((String) wiz.getProperty(ProjectLocationWizardPanel.NAME)); + createData.setServerInstanceID((String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID)); + createData.setJavaEEProfile((Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL)); + createData.setLibrariesDefinition( + SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES))); + createData.setServerLibraryName((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY)); + + AntProjectHelper h = EjbJarProjectGenerator.createProject(createData); handle.progress(2); FileObject dir = FileUtil.toFileObject(dirF); @@ -136,8 +140,8 @@ } // remember last used server - UserProjectSettings.getDefault().setLastUsedServer(serverInstanceID); - SharableLibrariesUtils.setLastProjectSharable(librariesDefinition != null); + UserProjectSettings.getDefault().setLastUsedServer(createData.getServerInstanceID()); + SharableLibrariesUtils.setLastProjectSharable(createData.getLibrariesDefinition() != null); // downgrade the Java platform or src level to 1.4 String platformName = (String)wiz.getProperty(ProjectServerWizardPanel.JAVA_PLATFORM); diff --git a/j2ee.ejbjarproject/test/unit/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProviderTest.java b/j2ee.ejbjarproject/test/unit/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProviderTest.java --- a/j2ee.ejbjarproject/test/unit/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProviderTest.java +++ b/j2ee.ejbjarproject/test/unit/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProviderTest.java @@ -44,6 +44,7 @@ import java.io.File; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties; import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata; import org.netbeans.modules.j2ee.dd.api.webservices.WebservicesMetadata; @@ -139,11 +140,11 @@ public void testNeedConfigurationFolder() { assertTrue("1.3 needs configuration folder", - EjbJarProvider.needConfigurationFolder(J2EEProjectProperties.J2EE_1_3)); + EjbJarProvider.needConfigurationFolder(EjbProjectConstants.J2EE_13_LEVEL)); assertTrue("1.4 needs configuration folder", - EjbJarProvider.needConfigurationFolder(J2EEProjectProperties.J2EE_1_4)); + EjbJarProvider.needConfigurationFolder(EjbProjectConstants.J2EE_14_LEVEL)); assertFalse("5.0 does not need configuration folder", - EjbJarProvider.needConfigurationFolder(J2EEProjectProperties.JAVA_EE_5)); + EjbJarProvider.needConfigurationFolder(EjbProjectConstants.JAVA_EE_5_LEVEL)); assertFalse("Anything else does not need configuration folder", EjbJarProvider.needConfigurationFolder("5.0")); assertFalse("Anything else does not need configuration folder", diff --git a/j2eeserver/nbproject/project.properties b/j2eeserver/nbproject/project.properties --- a/j2eeserver/nbproject/project.properties +++ b/j2eeserver/nbproject/project.properties @@ -39,7 +39,7 @@ is.autoload=true javac.source=1.5 -spec.version.base=1.57.0 +spec.version.base=1.58.0 javadoc.overview=${basedir}/api/doc/overview.html javadoc.arch=${basedir}/arch.xml diff --git a/j2eeserver/nbproject/project.xml b/j2eeserver/nbproject/project.xml --- a/j2eeserver/nbproject/project.xml +++ b/j2eeserver/nbproject/project.xml @@ -334,6 +334,7 @@ org.netbeans.modules.j2ee.deployment.common.api org.netbeans.modules.j2ee.deployment.devmodules.api + org.netbeans.modules.j2ee.deployment.devmodules.capabilities org.netbeans.modules.j2ee.deployment.devmodules.spi org.netbeans.modules.j2ee.deployment.plugins.api org.netbeans.modules.j2ee.deployment.plugins.spi diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Bundle.properties b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Bundle.properties --- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Bundle.properties +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Bundle.properties @@ -50,3 +50,10 @@ TXT_ServerManager=Servers CTL_Close=Close AD_Close=Close + +J2EE13.displayName=J2EE 1.3 +J2EE14.displayName=J2EE 1.4 +JavaEE5.displayName=Java EE 5 +JavaEE6Full.displayName=Java EE 6 +JavaEE6Web.displayName=Java EE 6 Web + diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Capabilities.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Capabilities.java new file mode 100644 --- /dev/null +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Capabilities.java @@ -0,0 +1,93 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.j2ee.deployment.devmodules.api; + +import java.util.Set; +import org.netbeans.api.project.Project; +import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; + +/** + * + * @author Petr Hejl + */ +public final class Capabilities { + + private final J2eeModuleProvider provider; + + private Capabilities(J2eeModuleProvider provider) { + this.provider = provider; + } + + public static Capabilities forProject(Project project) { + J2eeModuleProvider provider = project.getLookup().lookup(J2eeModuleProvider.class); + if (provider == null) { + return null; + } + return new Capabilities(provider); + } + +// public boolean isEJB21Supported() { +// return false; +// } +// +// public boolean isEJB30Supported() { +// return false; +// } +// +// public boolean isEJB31Supported() { +// return false; +// } +// +// public boolean isEJB31LiteSupported() { +// return false; +// } + + public boolean hasDefaultPersistenceProvider() { + J2eePlatform platform = Deployment.getDefault().getJ2eePlatform(provider.getServerInstanceID()); + if (platform == null) { + // server probably not registered, can't resolve whether default provider is supported (see #79856) + return false; + } + + Set profiles = platform.getSupportedProfiles(provider.getJ2eeModule().getModuleType()); + return (profiles.contains(Profile.JAVA_EE_5) || profiles.contains(Profile.JAVA_EE_6_FULL)) + && platform.isToolSupported("defaultPersistenceProviderJavaEE5"); + } +} diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Deployment.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Deployment.java --- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Deployment.java +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Deployment.java @@ -49,6 +49,7 @@ import java.util.logging.Level; import javax.enterprise.deploy.spi.Target; import javax.enterprise.deploy.spi.status.ProgressObject; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.common.api.Datasource; import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException; import org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener; @@ -333,7 +334,7 @@ * @since 1.6 */ public String[] getServerInstanceIDs(Object[] moduleTypes) { - return getServerInstanceIDs(moduleTypes, null, null); + return getServerInstanceIDs(moduleTypes, (Profile) null, null); } /** @@ -346,10 +347,15 @@ * @return ServerInstanceIDs of all registered server instances that meet * the specified requirements. * @since 1.6 + * @deprecated use {@link #getServerInstanceIDs(java.lang.Object[], org.netbeans.modules.j2ee.deployment.devmodules.api.Profile)} */ public String[] getServerInstanceIDs(Object[] moduleTypes, String specVersion) { return getServerInstanceIDs(moduleTypes, specVersion, null); } + + public String[] getServerInstanceIDs(Object[] moduleTypes, Profile profile) { + return getServerInstanceIDs(moduleTypes, profile, null); + } /** * Return ServerInstanceIDs of all registered server instances that support @@ -362,6 +368,7 @@ * @return ServerInstanceIDs of all registered server instances that meet * the specified requirements. * @since 1.6 + * @deprecated use {@link #getServerInstanceIDs(java.lang.Object[], org.netbeans.modules.j2ee.deployment.capabilities.Profile, java.lang.String[]) } */ public String[] getServerInstanceIDs(Object[] moduleTypes, String specVersion, String[] tools) { List result = new ArrayList(); @@ -370,14 +377,14 @@ J2eePlatform platform = getJ2eePlatform(serverInstanceIDs[i]); if (platform != null) { boolean isOk = true; - if (moduleTypes != null) { + if (moduleTypes != null) { Set platModuleTypes = platform.getSupportedModuleTypes(); for (int j = 0; j < moduleTypes.length; j++) { if (!platModuleTypes.contains(moduleTypes[j])) { isOk = false; } } - } + } if (isOk && specVersion != null) { Set platSpecVers = platform.getSupportedSpecVersions(); if (specVersion.equals(J2eeModule.J2EE_13)) { @@ -402,6 +409,46 @@ return (String[])result.toArray(new String[result.size()]); } + public String[] getServerInstanceIDs(Object[] moduleTypes, Profile profile, String[] tools) { + List result = new ArrayList(); + String[] serverInstanceIDs = getServerInstanceIDs(); + for (int i = 0; i < serverInstanceIDs.length; i++) { + J2eePlatform platform = getJ2eePlatform(serverInstanceIDs[i]); + if (platform != null) { + boolean isOk = true; + if (moduleTypes != null) { + Set platModuleTypes = platform.getSupportedModuleTypes(); + for (int j = 0; j < moduleTypes.length; j++) { + if (!platModuleTypes.contains(moduleTypes[j])) { + isOk = false; + } + } + } + if (isOk && profile != null) { + boolean supported = false; + for (Profile prof : platform.getSupportedProfiles()) { + if (prof == profile) { + supported = true; + break; + } + } + isOk = supported; + } + if (isOk && tools != null) { + for (int j = 0; j < tools.length; j++) { + if (!platform.isToolSupported(tools[j])) { + isOk = false; + } + } + } + if (isOk) { + result.add(serverInstanceIDs[i]); + } + } + } + return (String[]) result.toArray(new String[result.size()]); + } + /** * Returns the display name of the instance identified by the given id. * diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eeModule.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eeModule.java --- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eeModule.java +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eeModule.java @@ -43,7 +43,6 @@ import java.beans.PropertyChangeListener; import java.io.File; -import org.netbeans.modules.j2ee.dd.api.common.RootInterface; import org.netbeans.modules.j2ee.deployment.config.J2eeModuleAccessor; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleImplementation; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; @@ -83,23 +82,26 @@ /** The module is an Client Application archive. */ public static final Object CLIENT = ModuleType.CAR; - /** - * J2EE specification version 1.3 + /** + * J2EE specification version 1.3 * @since 1.5 + * @deprecated use {@link Profile#J2EE_13} */ public static final String J2EE_13 = "1.3"; //NOI18N - /** - * J2EE specification version 1.4 + /** + * J2EE specification version 1.4 * @since 1.5 + * @deprecated use {@link Profile#J2EE_14} */ public static final String J2EE_14 = "1.4"; //NOI18N /** - * + * * JAVA EE 5 specification version - * + * * @since 1.6 + * @deprecated use {@link Profile#JAVA_EE_5} */ - public static final String JAVA_EE_5 = "1.5"; // NOI18N + public static final String JAVA_EE_5 = "1.5"; // NOI18N public static final String APP_XML = "META-INF/application.xml"; public static final String WEB_XML = "WEB-INF/web.xml"; diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eePlatform.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eePlatform.java --- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eePlatform.java +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eePlatform.java @@ -59,6 +59,7 @@ import org.netbeans.api.java.platform.JavaPlatform; import org.netbeans.api.project.libraries.Library; import org.netbeans.api.project.libraries.LibraryManager; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.impl.ServerInstance; import org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformImpl; import org.netbeans.modules.j2ee.deployment.common.api.J2eeLibraryTypeProvider; @@ -71,7 +72,6 @@ import org.openide.util.ImageUtilities; import org.openide.util.Lookup; import org.openide.util.Parameters; -import org.openide.util.Utilities; /** @@ -390,6 +390,7 @@ * class. * * @return list of supported J2EE specification versions. + * @deprecated use {@link #getSupportedProfiles()} */ public Set/**/ getSupportedSpecVersions() { return impl.getSupportedSpecVersions(); @@ -402,11 +403,20 @@ * @param moduleType one of the constants defined in * {@link org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule} * @return list of supported J2EE specification versions. + * @deprecated use {@link #getSupportedProfiles(java.lang.Object)} */ public Set getSupportedSpecVersions(Object moduleType) { return impl.getSupportedSpecVersions(moduleType); } + public Set getSupportedProfiles() { + return impl.getSupportedProfiles(); + } + + public Set getSupportedProfiles(Object moduleType) { + return impl.getSupportedProfiles(moduleType); + } + /** * Return a list of supported J2EE module types. Use module types defined in the * {@link org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule} diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Profile.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Profile.java new file mode 100644 --- /dev/null +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Profile.java @@ -0,0 +1,130 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.j2ee.deployment.devmodules.api; + +import java.util.Comparator; +import org.openide.util.NbBundle; + +/** + * Represents the defined Java EE profiles. + * + * @author Petr Hejl + */ +public final class Profile implements Comparable { + + public static final Comparator REVERSE_COMPARATOR = new Comparator() { + + public int compare(Profile o1, Profile o2) { + return -(o1.compareTo(o2)); + } + }; + + public static final Profile J2EE_13 = new Profile(1, J2eeModule.J2EE_13, "J2EE13.displayName"); + + public static final Profile J2EE_14 = new Profile(2, J2eeModule.J2EE_14, "J2EE14.displayName"); + + public static final Profile JAVA_EE_5 = new Profile(3, J2eeModule.JAVA_EE_5, "JavaEE5.displayName"); + + public static final Profile JAVA_EE_6_FULL = new Profile(4, "EE_6_FULL", "JavaEE6Full.displayName"); + + public static final Profile JAVA_EE_6_WEB = new Profile(5, "EE_6_WEB", "JavaEE6Web.displayName"); + + private final int order; + + private final String name; + + private final String bundleKey; + + private Profile(int order, String name, String bundleKey) { + this.order = order; + this.name = name; + this.bundleKey = bundleKey; + } + + /** + * Returns the UI visible description of the profile. + * + * @return the UI visible description of the profile + */ + public String getDisplayName() { + return NbBundle.getMessage(Profile.class, bundleKey); + } + + public String toPropertiesString() { + return name; + } + + @Override + public String toString() { + return name; + } + + public int compareTo(Profile o) { + return this.order - o.order; + } + + public static Profile fromPropertiesString(String value) { + if (J2EE_13.toPropertiesString().equals(value)) { + return J2EE_13; + } else if (J2EE_14.toPropertiesString().equals(value)) { + return J2EE_14; + } else if (JAVA_EE_5.toPropertiesString().equals(value)) { + return JAVA_EE_5; + } else if (JAVA_EE_6_FULL.toPropertiesString().equals(value)) { + return JAVA_EE_6_FULL; + } else if (JAVA_EE_6_WEB.toPropertiesString().equals(value)) { + return JAVA_EE_6_WEB; + } else { + return null; + } + } + + public static Profile fromDeprecated(String value) { + if (J2eeModule.J2EE_13.equals(value)) { + return J2EE_13; + } else if (J2eeModule.J2EE_14.equals(value)) { + return J2EE_14; + } else if (J2eeModule.JAVA_EE_5.equals(value)) { + return JAVA_EE_5; + } + + return null; + } +} diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/spi/J2eePlatformImpl.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/spi/J2eePlatformImpl.java --- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/spi/J2eePlatformImpl.java +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/spi/J2eePlatformImpl.java @@ -46,8 +46,11 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.io.File; +import java.util.EnumSet; +import java.util.HashSet; import java.util.Set; import org.netbeans.api.java.platform.JavaPlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.spi.project.libraries.LibraryImplementation; import org.openide.util.Lookup; @@ -129,7 +132,7 @@ * * @return list of supported J2EE specification versions. */ - public abstract Set/**/ getSupportedSpecVersions(); + public abstract Set getSupportedSpecVersions(); /** * Return a list of supported J2EE specification versions for @@ -148,7 +151,29 @@ public Set getSupportedSpecVersions(Object moduleType) { return getSupportedSpecVersions(); } - + + public Set getSupportedProfiles() { + Set set = new HashSet(); + for (String spec : getSupportedSpecVersions()) { + Profile profile = Profile.fromDeprecated(spec); + if (profile != null) { + set.add(profile); + } + } + return set; + } + + public Set getSupportedProfiles(Object moduleType) { + Set set = new HashSet(); + for (String spec : getSupportedSpecVersions(moduleType)) { + Profile profile = Profile.fromDeprecated(spec); + if (profile != null) { + set.add(profile); + } + } + return set; + } + /** * Return a list of supported J2EE module types. Use module types defined in the * {@link org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule} diff --git a/web.project/nbproject/project.properties b/web.project/nbproject/project.properties --- a/web.project/nbproject/project.properties +++ b/web.project/nbproject/project.properties @@ -53,7 +53,7 @@ javac.compilerargs=-Xlint:unchecked javadoc.arch=${basedir}/arch.xml -spec.version.base=1.16.0 +spec.version.base=1.17.0 # needed for the TestUtil class test.unit.cp.extra= diff --git a/web.project/nbproject/project.xml b/web.project/nbproject/project.xml --- a/web.project/nbproject/project.xml +++ b/web.project/nbproject/project.xml @@ -148,7 +148,7 @@ 1 - 1.36 + 1.38 @@ -209,7 +209,7 @@ 4 - 1.54 + 1.58 diff --git a/web.project/src/org/netbeans/modules/web/project/Utils.java b/web.project/src/org/netbeans/modules/web/project/Utils.java --- a/web.project/src/org/netbeans/modules/web/project/Utils.java +++ b/web.project/src/org/netbeans/modules/web/project/Utils.java @@ -445,7 +445,7 @@ public static LibraryChooser.Filter getFilter(WebProject p) { LibraryChooser.Filter filter = null; WebModule wm = WebModule.getWebModule(p.getProjectDirectory()); - if (wm != null && "1.3".equals(wm.getJ2eePlatformVersion())) { // NOI18N + if (wm != null && WebModule.J2EE_13_LEVEL.equals(wm.getJ2eePlatformVersion())) { // NOI18N filter = new LibraryChooser.Filter() { public boolean accept(Library library) { if ("javascript".equals(library.getType())) { //NOI18N diff --git a/web.project/src/org/netbeans/modules/web/project/WebContainerImpl.java b/web.project/src/org/netbeans/modules/web/project/WebContainerImpl.java --- a/web.project/src/org/netbeans/modules/web/project/WebContainerImpl.java +++ b/web.project/src/org/netbeans/modules/web/project/WebContainerImpl.java @@ -76,6 +76,7 @@ import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata; import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel; import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction; +import org.netbeans.modules.web.api.webmodule.WebModule; import org.netbeans.modules.web.project.classpath.ClassPathProviderImpl; import org.netbeans.modules.web.spi.webmodule.WebModuleImplementation; import org.netbeans.spi.project.support.ant.AntProjectHelper; @@ -311,7 +312,7 @@ } private static boolean isDescriptorMandatory(String j2eeVersion) { - if ("1.3".equals(j2eeVersion) || "1.4".equals(j2eeVersion)) { + if (WebModule.J2EE_13_LEVEL.equals(j2eeVersion) || WebModule.J2EE_14_LEVEL.equals(j2eeVersion)) { return true; } return false; diff --git a/web.project/src/org/netbeans/modules/web/project/WebPersistenceProviderSupplier.java b/web.project/src/org/netbeans/modules/web/project/WebPersistenceProviderSupplier.java --- a/web.project/src/org/netbeans/modules/web/project/WebPersistenceProviderSupplier.java +++ b/web.project/src/org/netbeans/modules/web/project/WebPersistenceProviderSupplier.java @@ -45,6 +45,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Capabilities; import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; @@ -100,19 +101,7 @@ } public boolean supportsDefaultProvider() { - - J2eeModuleProvider j2eeModuleProvider = (J2eeModuleProvider) project.getLookup().lookup(J2eeModuleProvider.class); - J2eePlatform platform = Deployment.getDefault().getJ2eePlatform(j2eeModuleProvider.getServerInstanceID()); - - if (platform == null){ - // server probably not registered, can't resolve whether default provider is supported (see #79856) - return false; - } - - Set supportedVersions = platform.getSupportedSpecVersions(j2eeModuleProvider.getJ2eeModule().getModuleType()); - - return supportedVersions.contains(J2eeModule.JAVA_EE_5) - && platform.isToolSupported("defaultPersistenceProviderJavaEE5"); + return Capabilities.forProject(project).hasDefaultPersistenceProvider(); } diff --git a/web.project/src/org/netbeans/modules/web/project/api/WebProjectCreateData.java b/web.project/src/org/netbeans/modules/web/project/api/WebProjectCreateData.java --- a/web.project/src/org/netbeans/modules/web/project/api/WebProjectCreateData.java +++ b/web.project/src/org/netbeans/modules/web/project/api/WebProjectCreateData.java @@ -42,6 +42,7 @@ package org.netbeans.modules.web.project.api; import java.io.File; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.openide.filesystems.FileObject; /** @@ -50,13 +51,13 @@ * * @author Radko Najman */ -public class WebProjectCreateData { +public final class WebProjectCreateData { //common to create and import project private File projectDir; private String name; private String serverInstanceID; - private String javaEEVersion; + private Profile javaEEProfile; private String sourceLevel; private String javaPlatformName; private String serverLibraryName; @@ -133,20 +134,31 @@ this.serverInstanceID = serverInstanceID; } + public Profile getJavaEEProfile() { + return javaEEProfile; + } + + public void setJavaEEProfile(Profile javaEEProfile) { + this.javaEEProfile = javaEEProfile; + } + + /** * Gets Java EE version * @return Java EE version + * @deprecated */ public String getJavaEEVersion() { - return javaEEVersion; + return getJavaEEProfile().toPropertiesString(); } /** * Sets Java EE version * @param javaEEVersion Java EE version. Cannot be null. + * @deprecated */ public void setJavaEEVersion(String javaEEVersion) { - this.javaEEVersion = javaEEVersion; + setJavaEEProfile(Profile.fromPropertiesString(javaEEVersion)); } /** diff --git a/web.project/src/org/netbeans/modules/web/project/api/WebProjectUtilities.java b/web.project/src/org/netbeans/modules/web/project/api/WebProjectUtilities.java --- a/web.project/src/org/netbeans/modules/web/project/api/WebProjectUtilities.java +++ b/web.project/src/org/netbeans/modules/web/project/api/WebProjectUtilities.java @@ -54,7 +54,6 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.AntDeploymentHelper; import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; -import org.netbeans.modules.web.api.webmodule.WebModule; import org.netbeans.modules.web.project.*; import org.netbeans.modules.web.project.ui.customizer.WebProjectProperties; import org.netbeans.spi.project.support.ant.AntProjectHelper; @@ -92,6 +91,7 @@ import org.netbeans.modules.j2ee.dd.api.web.WebApp; import org.netbeans.modules.j2ee.dd.api.web.WelcomeFileList; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.java.api.common.ant.UpdateHelper; import org.netbeans.modules.java.api.common.project.ProjectProperties; import org.netbeans.modules.java.api.common.ui.PlatformUiSupport; @@ -188,7 +188,7 @@ String name = createData.getName(); String serverInstanceID = createData.getServerInstanceID(); String sourceStructure = createData.getSourceStructure(); - String j2eeLevel = createData.getJavaEEVersion(); + Profile j2eeProfile = createData.getJavaEEProfile(); String contextPath = createData.getContextPath(); String javaPlatformName = createData.getJavaPlatformName(); String sourceLevel = createData.getSourceLevel(); @@ -196,7 +196,7 @@ assert name != null: "Project name can't be null"; //NOI18N assert serverInstanceID != null: "Server instance ID can't be null"; //NOI18N assert sourceStructure != null: "Source structure can't be null"; //NOI18N - assert j2eeLevel != null: "Java EE version can't be null"; //NOI18N + assert j2eeProfile != null: "Java EE version can't be null"; //NOI18N final boolean createBluePrintsStruct = SRC_STRUCT_BLUEPRINTS.equals(sourceStructure); final boolean createJakartaStructure = SRC_STRUCT_JAKARTA.equals(sourceStructure); @@ -205,7 +205,7 @@ serverInstanceID, projectDir, createData.getServerLibraryName() != null); final AntProjectHelper h = setupProject(projectDir, name, serverInstanceID, - j2eeLevel, createData.getLibrariesDefinition(), serverLibraryName); + j2eeProfile, createData.getLibrariesDefinition(), serverLibraryName); FileObject srcFO = projectDir.createFolder(DEFAULT_SRC_FOLDER); FileObject confFolderFO = null; @@ -241,22 +241,25 @@ // create web.xml // PENDING : should be easier to define in layer and copy related FileObject (doesn't require systemClassLoader) String webXMLContent = null; - if (J2eeModule.JAVA_EE_5.equals(j2eeLevel)) + if (Profile.JAVA_EE_5 == j2eeProfile) { webXMLContent = readResource(Thread.currentThread().getContextClassLoader().getResourceAsStream(RESOURCE_FOLDER + "web-2.5.xml")); //NOI18N - else if (WebModule.J2EE_14_LEVEL.equals(j2eeLevel)) + } else if (Profile.J2EE_14 == j2eeProfile) { webXMLContent = readResource(Thread.currentThread().getContextClassLoader().getResourceAsStream(RESOURCE_FOLDER + "web-2.4.xml")); //NOI18N - else if (WebModule.J2EE_13_LEVEL.equals(j2eeLevel)) + } else if (Profile.J2EE_13 == j2eeProfile) { webXMLContent = readResource(Thread.currentThread().getContextClassLoader().getResourceAsStream(RESOURCE_FOLDER + "web-2.3.xml")); //NOI18N - assert webXMLContent != null : "Cannot find web.xml template for J2EE specification level:" + j2eeLevel; - final String webXmlText = webXMLContent; - FileObject webXML = FileUtil.createData(webInfFO, "web.xml");//NOI18N - FileLock lock = webXML.lock(); - BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(webXML.getOutputStream(lock))); - try { - bw.write(webXmlText); - } finally { - bw.close(); - lock.releaseLock(); + } + // FIXME JAVA_EE_6 + if (webXMLContent != null) { + final String webXmlText = webXMLContent; + FileObject webXML = FileUtil.createData(webInfFO, "web.xml");//NOI18N + FileLock lock = webXML.lock(); + BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(webXML.getOutputStream(lock))); + try { + bw.write(webXmlText); + } finally { + bw.close(); + lock.releaseLock(); + } } EditableProperties ep = h.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); @@ -454,7 +457,7 @@ File[] tstFolders = createData.getTestFolders(); FileObject docBase = createData.getDocBase(); FileObject libFolder = createData.getLibFolder(); - String j2eeLevel = createData.getJavaEEVersion(); + Profile j2eeProfile = createData.getJavaEEProfile(); String serverInstanceID = createData.getServerInstanceID(); String buildfile = createData.getBuildfile(); String javaPlatformName = createData.getJavaPlatformName(); @@ -467,13 +470,13 @@ assert sourceFolders != null: "Source package root can't be null"; //NOI18N assert docBase != null: "Web Pages folder can't be null"; //NOI18N assert serverInstanceID != null: "Server instance ID can't be null"; //NOI18N - assert j2eeLevel != null: "Java EE version can't be null"; //NOI18N + assert j2eeProfile != null: "Java EE version can't be null"; //NOI18N final String serverLibraryName = configureServerLibrary(createData.getLibrariesDefinition(), serverInstanceID, projectDir, createData.getServerLibraryName() != null); final AntProjectHelper antProjectHelper = setupProject(projectDir, name, - serverInstanceID, j2eeLevel, createData.getLibrariesDefinition(), serverLibraryName); + serverInstanceID, j2eeProfile, createData.getLibrariesDefinition(), serverLibraryName); final WebProject p = (WebProject) ProjectManager.getDefault().findProject(antProjectHelper.getProjectDirectory()); final ReferenceHelper referenceHelper = p.getReferenceHelper(); @@ -690,7 +693,7 @@ } private static AntProjectHelper setupProject(FileObject dirFO, String name, - String serverInstanceID, String j2eeLevel, String librariesDefinition, String serverLibraryName) throws IOException { + String serverInstanceID, Profile j2eeProfile, String librariesDefinition, String serverLibraryName) throws IOException { Utils.logUI(NbBundle.getBundle(WebProjectUtilities.class), "UI_WEB_PROJECT_CREATE_SHARABILITY", // NOI18N new Object[]{Boolean.valueOf(librariesDefinition != null), Boolean.valueOf(serverLibraryName != null)}); @@ -733,7 +736,7 @@ ep.setProperty(WebProjectProperties.JSPCOMPILATION_CLASSPATH, "${jspc.classpath}:${javac.classpath}"); - ep.setProperty(WebProjectProperties.J2EE_PLATFORM, j2eeLevel); + ep.setProperty(WebProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); ep.setProperty(WebProjectProperties.WAR_NAME, PropertyUtils.getUsablePropertyName(name) + ".war"); // NOI18N //XXX the name of the dist.ear.jar file should be different, but now it cannot be since the name is used as a key in module provider mapping @@ -825,9 +828,9 @@ // set j2ee.platform.classpath J2eePlatform j2eePlatform = Deployment.getDefault().getJ2eePlatform(serverInstanceID); - if (!j2eePlatform.getSupportedSpecVersions(J2eeModule.WAR).contains(j2eeLevel)) { + if (!j2eePlatform.getSupportedProfiles(J2eeModule.WAR).contains(j2eeProfile)) { Logger.getLogger("global").log(Level.WARNING, - "J2EE level:" + j2eeLevel + " not supported by server " + Deployment.getDefault().getServerInstanceDisplayName(serverInstanceID) + " for module type WAR"); // NOI18N + "J2EE level:" + j2eeProfile.getDisplayName() + " not supported by server " + Deployment.getDefault().getServerInstanceDisplayName(serverInstanceID) + " for module type WAR"); // NOI18N } if (!h.isSharableProject() || serverLibraryName == null) { diff --git a/web.project/src/org/netbeans/modules/web/project/ui/WebLogicalViewProvider.java b/web.project/src/org/netbeans/modules/web/project/ui/WebLogicalViewProvider.java --- a/web.project/src/org/netbeans/modules/web/project/ui/WebLogicalViewProvider.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/WebLogicalViewProvider.java @@ -97,6 +97,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; import org.netbeans.modules.java.api.common.SourceRoots; @@ -535,16 +536,16 @@ } public void actionPerformed(ActionEvent e) { - String j2eeSpec = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH). - getProperty(WebProjectProperties.J2EE_PLATFORM); - if (j2eeSpec == null) { - j2eeSpec = J2EEProjectProperties.JAVA_EE_5; // NOI18N + Profile j2eeProfile = Profile.fromPropertiesString(helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH). + getProperty(WebProjectProperties.J2EE_PLATFORM)); + if (j2eeProfile == null) { + j2eeProfile = Profile.JAVA_EE_5; // NOI18N Logger.getLogger(WebLogicalViewProvider.class.getName()).warning( "project ["+project.getProjectDirectory()+"] is missing "+WebProjectProperties.J2EE_PLATFORM+". " + // NOI18N - "default value will be used instead: "+j2eeSpec); // NOI18N - updateJ2EESpec(project, project.getAntProjectHelper(), j2eeSpec); + "default value will be used instead: "+j2eeProfile); // NOI18N + updateJ2EESpec(project, project.getAntProjectHelper(), j2eeProfile); } - String instance = BrokenServerSupport.selectServer(j2eeSpec, J2eeModule.WAR); + String instance = BrokenServerSupport.selectServer(j2eeProfile, J2eeModule.WAR); if (instance != null) { WebProjectProperties.setServerInstance( project, helper, instance); @@ -552,12 +553,12 @@ checkMissingServer(); } - private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final String j2eeSpec) { + private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final Profile j2eeProfile) { ProjectManager.mutex().postWriteRequest(new Runnable() { public void run() { try { EditableProperties projectProps = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); - projectProps.put(WebProjectProperties.J2EE_PLATFORM, j2eeSpec); + projectProps.put(WebProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); helper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, projectProps); ProjectManager.getDefault().saveProject(project); } catch (IOException e) { diff --git a/web.project/src/org/netbeans/modules/web/project/ui/customizer/Bundle.properties b/web.project/src/org/netbeans/modules/web/project/ui/customizer/Bundle.properties --- a/web.project/src/org/netbeans/modules/web/project/ui/customizer/Bundle.properties +++ b/web.project/src/org/netbeans/modules/web/project/ui/customizer/Bundle.properties @@ -243,10 +243,6 @@ LBL_RelativeURLExample=(e.g. /admin/login.jsp) -JavaEESpecLevel_50=Java EE 5 -J2EESpecLevel_14=J2EE 1.4 -J2EESpecLevel_13=J2EE 1.3 - Label_JVM_Argument=&VM Options: Label_VM_Hint=(used for running main classes or unit tests; e.g. -Xms10m) ACSN_CustomizerRun_NA=N/A diff --git a/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerFrameworks.java b/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerFrameworks.java --- a/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerFrameworks.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerFrameworks.java @@ -52,6 +52,8 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.ListSelectionListener; +import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.web.api.webmodule.ExtenderController; import org.netbeans.modules.web.api.webmodule.ExtenderController.Properties; import org.netbeans.modules.web.spi.webmodule.WebModuleExtender; @@ -110,10 +112,12 @@ return; } initialized = true; - String j2eeVersion = uiProperties.getProject().evaluator().getProperty(WebProjectProperties.J2EE_PLATFORM); + Profile j2eeProfile = Profile.fromPropertiesString(uiProperties.getProject().evaluator().getProperty(WebProjectProperties.J2EE_PLATFORM)); String serverInstanceID = uiProperties.getProject().evaluator().getProperty(WebProjectProperties.J2EE_SERVER_INSTANCE); Properties properties = controller.getProperties(); - properties.setProperty("j2eeLevel", j2eeVersion); // NOI18N + + // FIXME I left string here for compatibility reasons (frameworks) + properties.setProperty(ProjectServerWizardPanel.J2EE_LEVEL, j2eeProfile.toPropertiesString()); // NOI18N properties.setProperty("serverInstanceID", serverInstanceID); // NOI18N jListFrameworks.setModel(new DefaultListModel()); diff --git a/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerRun.java b/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerRun.java --- a/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerRun.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerRun.java @@ -54,6 +54,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.api.ServerInstance; import org.netbeans.modules.java.api.common.ant.UpdateHelper; import org.openide.util.HelpCtx; @@ -102,13 +103,10 @@ jCheckBoxDeployOnSave.setModel(uiProperties.DEPLOY_ON_SAVE_MODEL); jComboBoxServer.setModel( uiProperties.J2EE_SERVER_INSTANCE_MODEL ); - String j2eeVersion = jTextFieldJ2EE.getText().trim(); - if (j2eeVersion.equalsIgnoreCase(WebModule.J2EE_13_LEVEL)) - jTextFieldJ2EE_Display.setText(NbBundle.getMessage(CustomizerRun.class, "J2EESpecLevel_13")); //NOI18N; - else if (j2eeVersion.equalsIgnoreCase(WebModule.J2EE_14_LEVEL)) - jTextFieldJ2EE_Display.setText(NbBundle.getMessage(CustomizerRun.class, "J2EESpecLevel_14")); //NOI18N; - else if (j2eeVersion.equalsIgnoreCase(WebModule.JAVA_EE_5_LEVEL)) - jTextFieldJ2EE_Display.setText(NbBundle.getMessage(CustomizerRun.class, "JavaEESpecLevel_50")); //NOI18N; + Profile j2eeProfile = Profile.fromPropertiesString(jTextFieldJ2EE.getText().trim()); + if (j2eeProfile != null) { + jTextFieldJ2EE_Display.setText(j2eeProfile.getDisplayName()); + } setDeployOnSaveState(); } diff --git a/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java b/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java --- a/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java @@ -119,9 +119,6 @@ */ final public class WebProjectProperties { - public static final String J2EE_1_4 = "1.4"; // NOI18N - public static final String J2EE_1_3 = "1.3"; // NOI18N - // Special properties of the project public static final String WEB_PROJECT_NAME = "web.project.name"; //NOI18N public static final String JAVA_PLATFORM = "platform.active"; //NOI18N diff --git a/web.project/src/org/netbeans/modules/web/project/ui/wizards/ImportWebProjectWizardIterator.java b/web.project/src/org/netbeans/modules/web/project/ui/wizards/ImportWebProjectWizardIterator.java --- a/web.project/src/org/netbeans/modules/web/project/ui/wizards/ImportWebProjectWizardIterator.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/wizards/ImportWebProjectWizardIterator.java @@ -76,6 +76,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.web.project.Utils; import org.netbeans.spi.project.ui.support.ProjectChooser; @@ -140,7 +141,7 @@ File[] testFolders = (File[]) wiz.getProperty(WizardProperties.TEST_ROOT); String libName = (String) wiz.getProperty(WizardProperties.LIB_FOLDER); String serverInstanceID = (String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID); - String j2eeLevel = (String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); + Profile j2eeProfile = (Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); String webInfFolder = (String) wiz.getProperty(WizardProperties.WEBINF_FOLDER); FileObject wmFO = FileUtil.toFileObject (dirSrcF); @@ -171,8 +172,8 @@ libFolder = FileUtil.toFileObject(f); } - if(j2eeLevel == null) { - j2eeLevel = WebModule.J2EE_14_LEVEL; + if(j2eeProfile == null) { + j2eeProfile = Profile.J2EE_14; } String buildfile = projectLocationWizardPanel.getBuildFile(); @@ -185,7 +186,7 @@ createData.setTestFolders(testFolders); createData.setDocBase(docBase); createData.setLibFolder(libFolder); - createData.setJavaEEVersion(j2eeLevel); + createData.setJavaEEProfile(j2eeProfile); createData.setServerInstanceID(serverInstanceID); createData.setBuildfile(buildfile); createData.setJavaPlatformName((String) wiz.getProperty(ProjectServerWizardPanel.JAVA_PLATFORM)); diff --git a/web.project/src/org/netbeans/modules/web/project/ui/wizards/NewWebProjectWizardIterator.java b/web.project/src/org/netbeans/modules/web/project/ui/wizards/NewWebProjectWizardIterator.java --- a/web.project/src/org/netbeans/modules/web/project/ui/wizards/NewWebProjectWizardIterator.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/wizards/NewWebProjectWizardIterator.java @@ -78,6 +78,7 @@ import org.netbeans.modules.j2ee.common.project.ui.UserProjectSettings; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.web.project.Utils; import org.netbeans.spi.java.project.support.ui.SharableLibrariesUtils; @@ -137,7 +138,7 @@ if (createData.getSourceStructure() == null) { createData.setSourceStructure(WebProjectUtilities.SRC_STRUCT_BLUEPRINTS); } - createData.setJavaEEVersion((String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL)); + createData.setJavaEEProfile((Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL)); createData.setContextPath((String) wiz.getProperty(ProjectServerWizardPanel.CONTEXT_PATH)); createData.setJavaPlatformName((String) wiz.getProperty(ProjectServerWizardPanel.JAVA_PLATFORM)); createData.setSourceLevel((String) wiz.getProperty(ProjectServerWizardPanel.SOURCE_LEVEL)); diff --git a/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSourceFolders.java b/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSourceFolders.java --- a/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSourceFolders.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSourceFolders.java @@ -57,6 +57,7 @@ import org.netbeans.modules.j2ee.common.project.ui.ProjectLocationWizardPanel; import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.web.project.ProjectWebModule; import org.openide.DialogDisplayer; import org.openide.NotifyDescriptor; @@ -237,8 +238,8 @@ //rather setting to null that refreshing filesystem from a performance reason if (webXml != null && !webXml.isValid()) webXml = null; - String j2eeLevel = (String) wizardDescriptor.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); - if (webXml == null && (j2eeLevel.equals(J2eeModule.J2EE_13) || j2eeLevel.equals(J2eeModule.J2EE_14))) + Profile j2eeProfile = (Profile) wizardDescriptor.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); + if (webXml == null && (j2eeProfile == Profile.J2EE_13 || j2eeProfile == Profile.J2EE_14)) return NbBundle.getMessage(PanelSourceFolders.class, "MSG_FileNotFound", webInf.getPath()); //NOI18N for (int i=0; i + diff --git a/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSupportedFrameworksVisual.java b/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSupportedFrameworksVisual.java --- a/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSupportedFrameworksVisual.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSupportedFrameworksVisual.java @@ -61,6 +61,8 @@ import javax.swing.table.AbstractTableModel; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellRenderer; +import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.web.api.webmodule.ExtenderController; import org.netbeans.modules.web.api.webmodule.ExtenderController.Properties; import org.netbeans.modules.web.spi.webmodule.WebModuleExtender; @@ -284,7 +286,9 @@ void read(WizardDescriptor settings) { Properties properties = controller.getProperties(); properties.setProperty("name", (String) settings.getProperty("name")); // NOI18N - properties.setProperty("j2eeLevel", (String) settings.getProperty("j2eeLevel")); // NOI18N + + // FIXME I left string here for compatibility reasons (frameworks) + properties.setProperty(ProjectServerWizardPanel.J2EE_LEVEL, ((Profile) settings.getProperty(ProjectServerWizardPanel.J2EE_LEVEL)).toPropertiesString()); // NOI18N properties.setProperty("serverInstanceID", (String) settings.getProperty("serverInstanceID")); // NOI18N properties.setProperty("setSourceLevel", (String) settings.getProperty("setSourceLevel")); // NOI18N # HG changeset patch # User ffjre@netbeans.org # Date 1244038428 -7200 # Node ID 42ce5c05d352468b5e7d9bdfd7513a1324310dde # Parent 13a6ef7f7847c32790e637ddc47c1e5bc30d2d2d # Parent b55e03b6486f1d868f787d852928686e4201b705 Automated merge diff --git a/j2ee.clientproject/nbproject/project.properties b/j2ee.clientproject/nbproject/project.properties --- a/j2ee.clientproject/nbproject/project.properties +++ b/j2ee.clientproject/nbproject/project.properties @@ -38,7 +38,7 @@ # made subject to such option by the copyright holder. javac.compilerargs=-Xlint:unchecked -spec.version.base=1.10.0 +spec.version.base=1.11.0 javadoc.arch=${basedir}/arch.xml javadoc.preview=true javac.source=1.5 diff --git a/j2ee.clientproject/nbproject/project.xml b/j2ee.clientproject/nbproject/project.xml --- a/j2ee.clientproject/nbproject/project.xml +++ b/j2ee.clientproject/nbproject/project.xml @@ -135,7 +135,7 @@ 1 - 1.36 + 1.38 @@ -179,7 +179,7 @@ 4 - 1.42 + 1.58 diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientInjectionTargetQueryImplementation.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientInjectionTargetQueryImplementation.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientInjectionTargetQueryImplementation.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientInjectionTargetQueryImplementation.java @@ -45,6 +45,7 @@ import org.netbeans.api.java.source.CompilationController; import org.netbeans.api.java.source.SourceUtils; import org.netbeans.modules.j2ee.api.ejbjar.Car; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation; /** @@ -60,8 +61,8 @@ public boolean isInjectionTarget(CompilationController controller, TypeElement typeElement) { Car apiCar = Car.getCar(controller.getFileObject()); if (apiCar != null && - !apiCar.getJ2eePlatformVersion().equals("1.3") && - !apiCar.getJ2eePlatformVersion().equals("1.4")) { + !apiCar.getJ2eePlatformVersion().equals(EjbProjectConstants.J2EE_13_LEVEL) && + !apiCar.getJ2eePlatformVersion().equals(EjbProjectConstants.J2EE_14_LEVEL)) { return SourceUtils.isMainClass(typeElement.getQualifiedName().toString(), controller.getClasspathInfo()); } return false; diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProvider.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProvider.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProvider.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProvider.java @@ -61,6 +61,7 @@ import org.netbeans.api.project.SourceGroup; import org.netbeans.api.project.Sources; import org.netbeans.api.project.ui.OpenProjects; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.clientproject.ui.customizer.AppClientProjectProperties; import org.netbeans.modules.java.api.common.classpath.ClassPathProviderImpl; import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties; @@ -145,8 +146,8 @@ /** Package-private for unit test only. */ static boolean needConfigurationFolder(final String version) { - return J2EEProjectProperties.J2EE_1_3.equals(version) || - J2EEProjectProperties.J2EE_1_4.equals(version); + return EjbProjectConstants.J2EE_13_LEVEL.equals(version) || + EjbProjectConstants.J2EE_13_LEVEL.equals(version); } public File getMetaInfAsFile() { diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java @@ -55,6 +55,7 @@ import org.netbeans.api.project.ProjectManager; import org.netbeans.api.project.ant.AntArtifact; import org.netbeans.api.project.ant.AntArtifactQuery; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.api.ejbjar.EjbReference; import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer; import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceSupport; @@ -288,7 +289,7 @@ } private static boolean isDescriptorMandatory(String j2eeVersion) { - if ("1.3".equals(j2eeVersion) || "1.4".equals(j2eeVersion)) { + if (EjbProjectConstants.J2EE_13_LEVEL.equals(j2eeVersion) || EjbProjectConstants.J2EE_14_LEVEL.equals(j2eeVersion)) { return true; } return false; diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectCreateData.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectCreateData.java new file mode 100644 --- /dev/null +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectCreateData.java @@ -0,0 +1,164 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.j2ee.clientproject.api; + +import java.io.File; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; + +/** + * + * @author Petr Hejl + */ +public final class AppClientProjectCreateData { + + private File projectDir; + + private String name; + + private String mainClass; + + private Profile javaEEProfile; + + private String serverInstanceID; + + private String librariesDefinition; + + private String serverLibraryName; + + private File[] sourceFolders; + + private File[] testFolders; + + private File confFolder; + + private File libFolder; + + public AppClientProjectCreateData() { + } + + public Profile getJavaEEProfile() { + return javaEEProfile; + } + + public void setJavaEEProfile(Profile javaEEProfile) { + this.javaEEProfile = javaEEProfile; + } + + public String getLibrariesDefinition() { + return librariesDefinition; + } + + public void setLibrariesDefinition(String librariesDefinition) { + this.librariesDefinition = librariesDefinition; + } + + public String getMainClass() { + return mainClass; + } + + public void setMainClass(String mainClass) { + this.mainClass = mainClass; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public File getProjectDir() { + return projectDir; + } + + public void setProjectDir(File projectDir) { + this.projectDir = projectDir; + } + + public String getServerInstanceID() { + return serverInstanceID; + } + + public void setServerInstanceID(String serverInstanceID) { + this.serverInstanceID = serverInstanceID; + } + + public String getServerLibraryName() { + return serverLibraryName; + } + + public void setServerLibraryName(String serverLibraryName) { + this.serverLibraryName = serverLibraryName; + } + + public File getConfFolder() { + return confFolder; + } + + public void setConfFolder(File confFolder) { + this.confFolder = confFolder; + } + + public File getLibFolder() { + return libFolder; + } + + public void setLibFolder(File libFolder) { + this.libFolder = libFolder; + } + + public File[] getSourceFolders() { + return sourceFolders; + } + + public void setSourceFolders(File[] sourceFolders) { + this.sourceFolders = sourceFolders; + } + + public File[] getTestFolders() { + return testFolders; + } + + public void setTestFolders(File[] testFolders) { + this.testFolders = testFolders; + } + +} diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java @@ -68,6 +68,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.java.api.common.ant.UpdateHelper; import org.netbeans.modules.java.api.common.project.ProjectProperties; import org.netbeans.modules.java.api.common.ui.PlatformUiSupport; @@ -123,34 +124,53 @@ * @return the helper object permitting it to be further customized * @throws IOException in case something went wrong */ + @Deprecated public static AntProjectHelper createProject(File dir, final String name, final String mainClass, final String j2eeLevel, final String serverInstanceID) throws IOException { return createProject(dir, name, mainClass, j2eeLevel, serverInstanceID, null, null); } - + + @Deprecated public static AntProjectHelper createProject(File dir, final String name, final String mainClass, final String j2eeLevel, final String serverInstanceID, final String librariesDefinition, final String serverLibraryName) throws IOException { - + + AppClientProjectCreateData createData = new AppClientProjectCreateData(); + createData.setProjectDir(dir); + createData.setName(name); + createData.setMainClass(mainClass); + createData.setJavaEEProfile(Profile.fromPropertiesString(j2eeLevel)); + createData.setServerInstanceID(serverInstanceID); + createData.setLibrariesDefinition(librariesDefinition); + createData.setServerLibraryName(serverLibraryName); + return createProject(createData); + } + + public static AntProjectHelper createProject(final AppClientProjectCreateData createData) throws IOException { + File dir = createData.getProjectDir(); + final AntProjectHelper[] h = new AntProjectHelper[1]; final FileObject projectDir = FileUtil.createFolder(dir); - + // create project in one FS atomic action: FileSystem fs = projectDir.getFileSystem(); fs.runAtomicAction(new FileSystem.AtomicAction() { public void run() throws IOException { - AntProjectHelper helper = createProjectImpl(projectDir, name, - mainClass, j2eeLevel, serverInstanceID, librariesDefinition, serverLibraryName); + AntProjectHelper helper = createProjectImpl(createData, projectDir); h[0] = helper; }}); return h[0]; } - - private static AntProjectHelper createProjectImpl(FileObject projectDir, - String name, String mainClass, String j2eeLevel, final String serverInstanceID, - final String librariesDefinition, final String serverLibraryName) throws IOException { + + private static AntProjectHelper createProjectImpl(final AppClientProjectCreateData createData, + final FileObject projectDir) throws IOException { + + String name = createData.getName(); + String mainClass = createData.getMainClass(); + String serverInstanceID = createData.getServerInstanceID(); + Profile j2eeProfile = createData.getJavaEEProfile(); FileObject srcRoot = projectDir.createFolder(DEFAULT_SRC_FOLDER); FileObject javaRoot = srcRoot.createFolder(DEFAULT_JAVA_FOLDER); @@ -159,9 +179,9 @@ // create application-client.xml String resource; - if (J2eeModule.JAVA_EE_5.equals(j2eeLevel)) { + if (Profile.JAVA_EE_5.equals(j2eeProfile)) { resource = "org-netbeans-modules-j2ee-clientproject/application-client-5.xml"; // NOI18N - } else if (J2eeModule.J2EE_14.equals(j2eeLevel)) { + } else if (Profile.J2EE_14.equals(j2eeProfile)) { resource = "org-netbeans-modules-j2ee-clientproject/application-client-1.4.xml"; // NOI18N } else { resource = "org-netbeans-modules-j2ee-clientproject/application-client-1.3.xml"; // NOI18N @@ -171,13 +191,13 @@ appClient.setDisplayName(name); appClient.write(ddFile); - final String realServerLibraryName = configureServerLibrary(librariesDefinition, - serverInstanceID, projectDir, serverLibraryName != null); + final String realServerLibraryName = configureServerLibrary(createData.getLibrariesDefinition(), + serverInstanceID, projectDir, createData.getServerLibraryName() != null); final AntProjectHelper h = setupProject(projectDir, name, DEFAULT_SRC_FOLDER, DEFAULT_TEST_FOLDER, - null, null, null, mainClass, j2eeLevel, - serverInstanceID, librariesDefinition, realServerLibraryName); + null, null, null, mainClass, j2eeProfile, + serverInstanceID, createData.getLibrariesDefinition(), realServerLibraryName); EditableProperties ep = h.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); ep.put(AppClientProjectProperties.SOURCE_ROOT, DEFAULT_SRC_FOLDER); //NOI18N @@ -193,7 +213,7 @@ try { ProjectManager.mutex().writeAccess(new Mutex.ExceptionAction() { public Void run() throws Exception { - copyRequiredLibraries(h, refHelper, serverInstanceID, serverLibraryName); + copyRequiredLibraries(h, refHelper, createData); return null; } }); @@ -225,6 +245,7 @@ * @return the helper object permitting it to be further customized * @throws IOException in case something went wrong */ + @Deprecated public static AntProjectHelper importProject(final File dir, final String name, final File[] sourceFolders, final File[] testFolders, final File confFolder, final File libFolder, final String j2eeLevel, final String serverInstanceID) throws IOException { @@ -232,36 +253,59 @@ return importProject(dir, name, sourceFolders, testFolders, confFolder, libFolder, j2eeLevel, serverInstanceID, null, null); } - + + @Deprecated public static AntProjectHelper importProject(final File dir, final String name, final File[] sourceFolders, final File[] testFolders, final File confFolder, final File libFolder, final String j2eeLevel, final String serverInstanceID, final String librariesDefinition, final String serverLibraryName) throws IOException { + + AppClientProjectCreateData createData = new AppClientProjectCreateData(); + createData.setProjectDir(dir); + createData.setName(name); + createData.setSourceFolders(sourceFolders); + createData.setTestFolders(testFolders); + createData.setConfFolder(confFolder); + createData.setLibFolder(libFolder); + createData.setJavaEEProfile(Profile.fromPropertiesString(j2eeLevel)); + createData.setServerInstanceID(serverInstanceID); + createData.setLibrariesDefinition(librariesDefinition); + createData.setServerLibraryName(serverLibraryName); + return importProject(createData); + } + + public static AntProjectHelper importProject(final AppClientProjectCreateData createData) throws IOException { + File dir = createData.getProjectDir(); + final AntProjectHelper[] h = new AntProjectHelper[1]; final FileObject projectDir = FileUtil.createFolder(dir); - + // create project in one FS atomic action: FileSystem fs = projectDir.getFileSystem(); fs.runAtomicAction(new FileSystem.AtomicAction() { public void run() throws IOException { - AntProjectHelper helper = importProjectImpl(projectDir, name, sourceFolders, - testFolders, confFolder, libFolder, j2eeLevel, serverInstanceID, librariesDefinition, serverLibraryName); + AntProjectHelper helper = importProjectImpl(createData, projectDir); h[0] = helper; }}); return h[0]; } - private static AntProjectHelper importProjectImpl(final FileObject projectDir, final String name, - final File[] sourceFolders, final File[] testFolders, final File confFolder, - final File libFolder, String j2eeLevel, final String serverInstanceID, String librariesDefinition, final String serverLibraryName) throws IOException { + private static AntProjectHelper importProjectImpl(final AppClientProjectCreateData createData, final FileObject projectDir) throws IOException { + final File[] sourceFolders = createData.getSourceFolders(); + final File[] testFolders = createData.getTestFolders(); + String name = createData.getName(); + String serverInstanceID = createData.getServerInstanceID(); + File confFolder = createData.getConfFolder(); + Profile j2eeProfile = createData.getJavaEEProfile(); + assert sourceFolders != null && testFolders != null: "Package roots can't be null"; //NOI18N - final String realServerLibraryName = configureServerLibrary(librariesDefinition, - serverInstanceID, projectDir, serverLibraryName != null); + final String realServerLibraryName = configureServerLibrary(createData.getLibrariesDefinition(), + serverInstanceID, projectDir, createData.getServerLibraryName() != null); final AntProjectHelper h = setupProject(projectDir, name, null, null, - confFolder, (libFolder == null ? null : libFolder), - null, null, j2eeLevel, serverInstanceID, librariesDefinition, realServerLibraryName); + confFolder, createData.getLibFolder(), + null, null, j2eeProfile, serverInstanceID, createData.getLibrariesDefinition(), realServerLibraryName); final AppClientProject p = (AppClientProject) ProjectManager.getDefault().findProject(projectDir); final ReferenceHelper refHelper = p.getReferenceHelper(); @@ -308,7 +352,7 @@ } } h.putPrimaryConfigurationData(data,true); - copyRequiredLibraries(h, refHelper, serverInstanceID, serverLibraryName); + copyRequiredLibraries(h, refHelper, createData); ProjectManager.getDefault().saveProject(p); return null; } @@ -328,7 +372,7 @@ //AppClient root = DDProvider.getDefault().getDDRoot(Car.getCar(appClientXML)); AppClient root = DDProvider.getDefault().getDDRoot(appClientXML); boolean writeDD = false; - if (new BigDecimal(AppClient.VERSION_1_3).equals(root.getVersion()) && J2eeModule.J2EE_14.equals(j2eeLevel)) { // NOI18N + if (new BigDecimal(AppClient.VERSION_1_3).equals(root.getVersion()) && Profile.J2EE_14.equals(j2eeProfile)) { // NOI18N root.setVersion(new BigDecimal(AppClient.VERSION_1_4)); writeDD = true; } @@ -347,9 +391,9 @@ } else { // XXX just temporary, since now the import would fail due to another bug String resource; - if (J2eeModule.JAVA_EE_5.equals(j2eeLevel)) { + if (Profile.JAVA_EE_5.equals(j2eeProfile)) { resource = "org-netbeans-modules-j2ee-clientproject/application-client-5.xml"; // NOI18N - } else if (J2eeModule.J2EE_14.equals(j2eeLevel)) { + } else if (Profile.J2EE_14.equals(j2eeProfile)) { resource = "org-netbeans-modules-j2ee-clientproject/application-client-1.4.xml"; // NOI18N } else { resource = "org-netbeans-modules-j2ee-clientproject/application-client-1.3.xml"; // NOI18N @@ -362,7 +406,7 @@ } private static void copyRequiredLibraries(AntProjectHelper h, ReferenceHelper rh, - String serverInstanceId, String serverlibraryName) throws IOException { + AppClientProjectCreateData createData) throws IOException { if (!h.isSharableProject()) { return; @@ -427,7 +471,7 @@ private static AntProjectHelper setupProject(FileObject dirFO, String name, String srcRoot, String testRoot, File configFiles, File libraries, - String resources, String mainClass, String j2eeLevel, + String resources, String mainClass, Profile j2eeProfile, String serverInstanceID, String librariesDefinition, String serverLibraryName) throws IOException { Utils.logUI(NbBundle.getBundle(AppClientProjectGenerator.class), "UI_APP_PROJECT_CREATE_SHARABILITY", // NOI18N @@ -573,14 +617,14 @@ Deployment deployment = Deployment.getDefault(); J2eePlatform j2eePlatform = Deployment.getDefault().getJ2eePlatform(serverInstanceID); - if (!j2eePlatform.getSupportedSpecVersions(J2eeModule.CLIENT).contains(j2eeLevel)) { + if (!j2eePlatform.getSupportedProfiles(J2eeModule.CLIENT).contains(j2eeProfile)) { Logger.getLogger("global").log(Level.WARNING, NbBundle.getMessage(AppClientProjectGenerator.class, "MSG_Warning_SpecLevelNotSupported", - new Object[] {j2eeLevel, Deployment.getDefault().getServerInstanceDisplayName(serverInstanceID)})); + new Object[] {j2eeProfile, Deployment.getDefault().getServerInstanceDisplayName(serverInstanceID)})); } ep.setProperty(AppClientProjectProperties.J2EE_SERVER_TYPE, deployment.getServerID(serverInstanceID)); - ep.setProperty(AppClientProjectProperties.J2EE_PLATFORM, j2eeLevel); + ep.setProperty(AppClientProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); ep.setProperty("manifest.file", "${" +AppClientProjectProperties.META_INF + "}/" + MANIFEST_FILE); // NOI18N if (h.isSharableProject() && serverLibraryName != null) { diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java @@ -70,6 +70,7 @@ import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties; import org.netbeans.modules.j2ee.common.ui.BrokenServerSupport; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; import org.netbeans.modules.java.api.common.SourceRoots; @@ -474,15 +475,15 @@ } public void actionPerformed(ActionEvent e) { - String j2eeSpec = project.evaluator().getProperty(AppClientProjectProperties.J2EE_PLATFORM); - if (j2eeSpec == null) { - j2eeSpec = J2EEProjectProperties.JAVA_EE_5; // NOI18N + Profile j2eeProfile = Profile.fromPropertiesString(project.evaluator().getProperty(AppClientProjectProperties.J2EE_PLATFORM)); + if (j2eeProfile == null) { + j2eeProfile = Profile.JAVA_EE_5; Logger.getLogger(AppClientLogicalViewProvider.class.getName()).warning( "project ["+project.getProjectDirectory()+"] is missing "+AppClientProjectProperties.J2EE_PLATFORM+". " + // NOI18N - "default value will be used instead: "+j2eeSpec); // NOI18N - updateJ2EESpec(project, project.getAntProjectHelper(), j2eeSpec); + "default value will be used instead: "+j2eeProfile); // NOI18N + updateJ2EESpec(project, project.getAntProjectHelper(), j2eeProfile); } - String instance = BrokenServerSupport.selectServer(j2eeSpec, J2eeModule.CLIENT); + String instance = BrokenServerSupport.selectServer(j2eeProfile, J2eeModule.CLIENT); if (instance != null) { AppClientProjectProperties.setServerInstance( project, helper.getAntProjectHelper(), instance); @@ -490,12 +491,12 @@ checkMissingServer(); } - private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final String j2eeSpec) { + private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final Profile j2eeProfile) { ProjectManager.mutex().postWriteRequest(new Runnable() { public void run() { try { EditableProperties projectProps = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); - projectProps.put(AppClientProjectProperties.J2EE_PLATFORM, j2eeSpec); + projectProps.put(AppClientProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); helper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, projectProps); ProjectManager.getDefault().saveProject(project); } catch (IOException e) { diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientCompositePanelProvider.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientCompositePanelProvider.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientCompositePanelProvider.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientCompositePanelProvider.java @@ -45,6 +45,7 @@ import java.util.ResourceBundle; import javax.swing.JComponent; import javax.swing.JPanel; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.clientproject.AppClientProject; import org.netbeans.modules.j2ee.clientproject.wsclient.CustomizerWSClientHost; import org.netbeans.modules.j2ee.clientproject.wsclient.NoWebServiceClientsPanel; @@ -125,7 +126,7 @@ if (clientSupport != null) { serviceClientsSettings = clientSupport.getServiceClients(); } - if(J2EEProjectProperties.J2EE_1_4.equals( + if(EjbProjectConstants.J2EE_14_LEVEL.equals( project.getCarModule().getJ2eePlatformVersion()) && serviceClientsSettings != null && serviceClientsSettings.size() > 0) { ProjectCustomizer.Category clients = ProjectCustomizer.Category.create(WEBSERVICECLIENTS, diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java @@ -85,6 +85,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.java.api.common.SourceRoots; import org.netbeans.modules.java.api.common.ant.UpdateHelper; import org.netbeans.modules.java.api.common.project.ProjectProperties; @@ -334,8 +335,8 @@ PLATFORM_MODEL = PlatformUiSupport.createPlatformComboBoxModel (evaluator.getProperty(JAVA_PLATFORM)); PLATFORM_LIST_RENDERER = PlatformUiSupport.createPlatformListCellRenderer(); SpecificationVersion minimalSourceLevel = null; - if (J2EEProjectProperties.JAVA_EE_5.equals(evaluator.getProperty(J2EE_PLATFORM))) { - minimalSourceLevel = new SpecificationVersion(J2EEProjectProperties.JAVA_EE_5); + if (Profile.JAVA_EE_5.equals(Profile.fromPropertiesString(evaluator.getProperty(J2EE_PLATFORM)))) { + minimalSourceLevel = new SpecificationVersion("1.5"); } JAVAC_SOURCE_MODEL = PlatformUiSupport.createSourceLevelComboBoxModel(PLATFORM_MODEL, evaluator.getProperty(JAVAC_SOURCE), evaluator.getProperty(JAVAC_TARGET), minimalSourceLevel); JAVAC_SOURCE_RENDERER = PlatformUiSupport.createSourceLevelListCellRenderer (); diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle.properties b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle.properties --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle.properties +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle.properties @@ -67,10 +67,6 @@ LBL_IW_CreatedFile_LabelMnemonic=F ACS_LBL_IW_CreatedFile_A11YDesc=Location of the created buildfile -#ImportLocationVisual -J2EESpecLevel_15=Java EE 5 -J2EESpecLevel_14=J2EE 1.4 -J2EESpecLevel_13=J2EE 1.3 ACS_NWP1_NamePanel_A11YDesc=Project Name and Location Panel #LBL_IW_ImportTitle=Name and Location TXT_ImportAppClientModule=Enterprise Application Client with Existing Sources diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/ImportAppClientProjectWizardIterator.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/ImportAppClientProjectWizardIterator.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/ImportAppClientProjectWizardIterator.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/ImportAppClientProjectWizardIterator.java @@ -54,6 +54,7 @@ import org.netbeans.modules.j2ee.api.ejbjar.Ear; import org.netbeans.modules.j2ee.clientproject.AppClientProject; import org.netbeans.modules.j2ee.clientproject.Utils; +import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectCreateData; import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectGenerator; import org.netbeans.modules.j2ee.common.project.ui.UserProjectSettings; import org.netbeans.modules.j2ee.common.SharabilityUtility; @@ -61,6 +62,7 @@ import org.netbeans.modules.j2ee.common.project.ui.ProjectLocationWizardPanel; import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.ui.support.ProjectChooser; import org.openide.WizardDescriptor; @@ -113,22 +115,21 @@ if (dirF != null) { dirF = FileUtil.normalizeFile(dirF); } - String name = (String) wiz.getProperty(ProjectLocationWizardPanel.NAME); -// File dirSrcF = (File) wiz.getProperty (WizardProperties.SOURCE_ROOT); - File[] sourceFolders = (File[]) wiz.getProperty(WizardProperties.JAVA_ROOT); - File[] testFolders = (File[]) wiz.getProperty(WizardProperties.TEST_ROOT); - File configFilesFolder = (File) wiz.getProperty(WizardProperties.CONFIG_FILES_FOLDER); - File libName = (File) wiz.getProperty(WizardProperties.LIB_FOLDER); - String serverInstanceID = (String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID); - String j2eeLevel = (String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); - - String librariesDefinition = - SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES)); - String serverLibraryName = (String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY); - - AntProjectHelper h = AppClientProjectGenerator.importProject(dirF, name, - sourceFolders, testFolders, configFilesFolder, libName, j2eeLevel, - serverInstanceID, librariesDefinition, serverLibraryName); + + AppClientProjectCreateData createData = new AppClientProjectCreateData(); + createData.setProjectDir(dirF); + createData.setName((String) wiz.getProperty(ProjectLocationWizardPanel.NAME)); + createData.setSourceFolders((File[]) wiz.getProperty(WizardProperties.JAVA_ROOT)); + createData.setTestFolders((File[]) wiz.getProperty(WizardProperties.TEST_ROOT)); + createData.setConfFolder((File) wiz.getProperty(WizardProperties.CONFIG_FILES_FOLDER)); + createData.setLibFolder((File) wiz.getProperty(WizardProperties.LIB_FOLDER)); + createData.setServerInstanceID((String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID)); + createData.setJavaEEProfile((Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL)); + createData.setLibrariesDefinition( + SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES))); + createData.setServerLibraryName((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY)); + + AntProjectHelper h = AppClientProjectGenerator.importProject(createData); handle.progress(2); @@ -151,7 +152,7 @@ } // remember last used server - UserProjectSettings.getDefault().setLastUsedServer(serverInstanceID); + UserProjectSettings.getDefault().setLastUsedServer(createData.getServerInstanceID()); // downgrade the Java platform or src level to 1.4 String platformName = (String)wiz.getProperty(ProjectServerWizardPanel.JAVA_PLATFORM); diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/NewAppClientProjectWizardIterator.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/NewAppClientProjectWizardIterator.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/NewAppClientProjectWizardIterator.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/NewAppClientProjectWizardIterator.java @@ -55,12 +55,14 @@ import org.netbeans.api.project.ProjectManager; import org.netbeans.modules.j2ee.api.ejbjar.Ear; import org.netbeans.modules.j2ee.clientproject.AppClientProject; +import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectCreateData; import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectGenerator; import org.netbeans.modules.j2ee.common.project.ui.UserProjectSettings; import org.netbeans.modules.j2ee.common.SharabilityUtility; import org.netbeans.modules.j2ee.common.project.ui.ProjectLocationWizardPanel; import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.spi.java.project.support.ui.SharableLibrariesUtils; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.ui.support.ProjectChooser; @@ -116,18 +118,19 @@ if (dirF != null) { dirF = FileUtil.normalizeFile(dirF); } - String name = (String)wiz.getProperty(ProjectLocationWizardPanel.NAME); + String mainClass = (String)wiz.getProperty(ProjectServerWizardPanel.MAIN_CLASS); + AppClientProjectCreateData createData = new AppClientProjectCreateData(); + createData.setProjectDir(dirF); + createData.setName((String)wiz.getProperty(ProjectLocationWizardPanel.NAME)); + createData.setMainClass(mainClass); + createData.setServerInstanceID((String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID)); + createData.setJavaEEProfile((Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL)); + createData.setLibrariesDefinition( + SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES))); + createData.setServerLibraryName((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY)); - String serverInstanceID = (String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID); - String j2eeLevel = (String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); - - String librariesDefinition = - SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES)); - String serverLibraryName = (String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY); - - AntProjectHelper h = AppClientProjectGenerator.createProject(dirF, name, - mainClass, j2eeLevel, serverInstanceID, librariesDefinition, serverLibraryName); + AntProjectHelper h = AppClientProjectGenerator.createProject(createData); handle.progress(2); @@ -155,8 +158,8 @@ } // remember last used server - UserProjectSettings.getDefault().setLastUsedServer(serverInstanceID); - SharableLibrariesUtils.setLastProjectSharable(librariesDefinition != null); + UserProjectSettings.getDefault().setLastUsedServer(createData.getServerInstanceID()); + SharableLibrariesUtils.setLastProjectSharable(createData.getLibrariesDefinition() != null); // downgrade the Java platform or src level to 1.4 String platformName = (String)wiz.getProperty(ProjectServerWizardPanel.JAVA_PLATFORM); diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectWebServicesClientSupport.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectWebServicesClientSupport.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectWebServicesClientSupport.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectWebServicesClientSupport.java @@ -61,6 +61,7 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; import org.netbeans.api.project.ui.OpenProjects; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.clientproject.AppClientProject; import org.netbeans.modules.j2ee.clientproject.AppClientProjectType; import org.netbeans.modules.j2ee.clientproject.AppClientProvider; @@ -504,7 +505,7 @@ public List getStubDescriptors() { ArrayList stubs = new ArrayList(2); String version = project.getCarModule().getJ2eePlatformVersion(); - if(J2eeModule.J2EE_14.equals(version)) { + if (EjbProjectConstants.J2EE_14_LEVEL.equals(version)) { stubs.add(jsr109ClientStub); } stubs.add(jaxrpcClientStub); diff --git a/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientProviderTest.java b/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientProviderTest.java --- a/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientProviderTest.java +++ b/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientProviderTest.java @@ -45,6 +45,7 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; import org.netbeans.junit.NbTestCase; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.clientproject.test.TestUtil; import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties; import org.netbeans.modules.j2ee.dd.api.client.AppClientMetadata; @@ -124,11 +125,11 @@ public void testNeedConfigurationFolder() { assertTrue("1.3 needs configuration folder", - AppClientProvider.needConfigurationFolder(J2EEProjectProperties.J2EE_1_3)); + AppClientProvider.needConfigurationFolder(EjbProjectConstants.J2EE_13_LEVEL)); assertTrue("1.4 needs configuration folder", - AppClientProvider.needConfigurationFolder(J2EEProjectProperties.J2EE_1_4)); + AppClientProvider.needConfigurationFolder(EjbProjectConstants.J2EE_14_LEVEL)); assertFalse("5.0 does not need configuration folder", - AppClientProvider.needConfigurationFolder(J2EEProjectProperties.JAVA_EE_5)); + AppClientProvider.needConfigurationFolder(EjbProjectConstants.JAVA_EE_5_LEVEL)); assertFalse("Anything else does not need configuration folder", AppClientProvider.needConfigurationFolder("5.0")); assertFalse("Anything else does not need configuration folder", diff --git a/j2ee.common/manifest.mf b/j2ee.common/manifest.mf --- a/j2ee.common/manifest.mf +++ b/j2ee.common/manifest.mf @@ -2,5 +2,5 @@ OpenIDE-Module: org.netbeans.modules.j2ee.common/1 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/common/Bundle.properties OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker -OpenIDE-Module-Specification-Version: 1.37 +OpenIDE-Module-Specification-Version: 1.38 AutoUpdate-Show-In-Client: false diff --git a/j2ee.common/nbproject/project.xml b/j2ee.common/nbproject/project.xml --- a/j2ee.common/nbproject/project.xml +++ b/j2ee.common/nbproject/project.xml @@ -158,7 +158,7 @@ 4 - 1.23 + 1.58 diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/Util.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/Util.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/Util.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/Util.java @@ -382,6 +382,7 @@ * is not known specification version constant * * @since 1.18 + * @deprecated */ public static String getJ2eeSpecificationLabel(String specificationVersion) { Parameters.notNull("specificationVersion", specificationVersion); // NOI18N diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/Bundle.properties b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/Bundle.properties --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/Bundle.properties +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/Bundle.properties @@ -47,11 +47,6 @@ #Sharable visual panel PanelSharabilityVisual.label=Sharability -#J2eePlatformUiSupport -JAVA_EE_5_displayName=Java EE 5 -J2EE_1_4_displayName=J2EE 1.4 -J2EE_1_3_displayName=J2EE 1.3 - #Sharable panel PanelSharability.licenseWarning.text=There may be legal considerations when sharing server JAR files. Be sure to check the license for your server to make sure you can distribute server JAR files to other developers. PanelSharability.relativePathWarning.text=Please make sure the relative path to library definitions is always accessible in the same way. @@ -110,9 +105,6 @@ LBL_PanelOptions_SharableProject_Checkbox=Project Shared With Other Users LBL_PanelOptions_Location_Label=Sharable Libraries Location: LBL_Browse_Libraries_AcceptedFiles=*.properties files -JavaEESpecLevel_50=Java EE 5 -J2EESpecLevel_14=J2EE 1.4 -J2EESpecLevel_13=J2EE 1.3 ACS_LBL_NWP1_SetAsMain_A11YDesc=Set as Main Project ACS_LBL_NPW1_J2EESpecLevel_A11YDesc=Java EE Version Combo Box ACS_LBL_NWP1_ContextPath_A11YDesc=Context Path diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2EEProjectProperties.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2EEProjectProperties.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2EEProjectProperties.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2EEProjectProperties.java @@ -52,10 +52,6 @@ */ public final class J2EEProjectProperties { - public static final String JAVA_EE_5 = "1.5"; // NOI18N - public static final String J2EE_1_4 = "1.4"; // NOI18N - public static final String J2EE_1_3 = "1.3"; // NOI18N - public static final String J2EE_PLATFORM_CLASSPATH = "j2ee.platform.classpath"; //NOI18N /** diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eePlatformUiSupport.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eePlatformUiSupport.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eePlatformUiSupport.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eePlatformUiSupport.java @@ -51,6 +51,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.openide.util.NbBundle; /** @@ -58,37 +59,53 @@ * @author Andrei Badea, Radko Najman */ public class J2eePlatformUiSupport { - - private static final String JAVA_EE_5_DISPLAY_NAME = NbBundle.getMessage(J2eePlatformUiSupport.class, "JAVA_EE_5_displayName"); // NOI18N - private static final String J2EE_1_4_DISPLAY_NAME = NbBundle.getMessage(J2eePlatformUiSupport.class, "J2EE_1_4_displayName"); // NOI18N - private static final String J2EE_1_3_DISPLAY_NAME = NbBundle.getMessage(J2eePlatformUiSupport.class, "J2EE_1_3_displayName"); // NOI18N private J2eePlatformUiSupport() { } - + + @Deprecated public static ComboBoxModel createPlatformComboBoxModel(String serverInstanceId, String j2eeLevel, Object moduleType) { - return new J2eePlatformComboBoxModel(serverInstanceId, j2eeLevel, moduleType); + return new J2eePlatformComboBoxModel(serverInstanceId, Profile.fromPropertiesString(j2eeLevel), moduleType); } - + + public static ComboBoxModel createPlatformComboBoxModel(String serverInstanceId, Profile j2eeProfile, Object moduleType) { + return new J2eePlatformComboBoxModel(serverInstanceId, j2eeProfile, moduleType); + } + + @Deprecated public static ComboBoxModel createSpecVersionComboBoxModel(String j2eeSpecVersion) { - return new J2eeSpecVersionComboBoxModel(j2eeSpecVersion); + return new J2eeSpecVersionComboBoxModel(Profile.fromPropertiesString(j2eeSpecVersion)); } - + + public static ComboBoxModel createSpecVersionComboBoxModel(Profile profile) { + return new J2eeSpecVersionComboBoxModel(profile); + } + public static boolean getJ2eePlatformAndSpecVersionMatch(Object j2eePlatformModelObject, Object j2eeSpecVersionModelObject, Object moduleType) { - if (!(j2eePlatformModelObject instanceof J2eePlatformAdapter && j2eeSpecVersionModelObject instanceof String)) { + if (!(j2eePlatformModelObject instanceof J2eePlatformAdapter + && (j2eeSpecVersionModelObject instanceof String || j2eeSpecVersionModelObject instanceof Profile))) { return false; } - + J2eePlatform j2eePlatform = ((J2eePlatformAdapter)j2eePlatformModelObject).getJ2eePlatform(); - String specVersion = (String)j2eeSpecVersionModelObject; - return j2eePlatform.getSupportedSpecVersions(moduleType).contains(specVersion); + Profile profile = null; + if (j2eeSpecVersionModelObject instanceof Profile) { + profile = (Profile) j2eeSpecVersionModelObject; + } else { + profile = Profile.fromPropertiesString((String) j2eeSpecVersionModelObject); + } + return j2eePlatform.getSupportedProfiles(moduleType).contains(profile); } - + + @Deprecated public static String getSpecVersion(Object j2eeSpecVersionModelObject) { - return ((J2eePlatformComboBoxItem)j2eeSpecVersionModelObject).getCode(); + return ((J2eePlatformComboBoxItem)j2eeSpecVersionModelObject).getProfile().toPropertiesString(); } - + + public static Profile getJavaEEProfile(Object j2eeSpecVersionModelObject) { + return ((J2eePlatformComboBoxItem) j2eeSpecVersionModelObject).getProfile(); + } public static String getServerInstanceID(Object j2eePlatformModelObject) { if (j2eePlatformModelObject == null) @@ -120,12 +137,12 @@ private J2eePlatformAdapter[] j2eePlatforms; private final String initialJ2eePlatform; private J2eePlatformAdapter selectedJ2eePlatform; - private final String j2eeLevel; + private final Profile j2eeProfile; private final Object moduleType; - public J2eePlatformComboBoxModel(String serverInstanceID, String j2eeLevel, Object moduleType) { + public J2eePlatformComboBoxModel(String serverInstanceID, Profile j2eeProfile, Object moduleType) { initialJ2eePlatform = serverInstanceID; - this.j2eeLevel = j2eeLevel; + this.j2eeProfile = j2eeProfile; this.moduleType = moduleType; getJ2eePlatforms(moduleType); @@ -166,7 +183,7 @@ J2eePlatform j2eePlatform = Deployment.getDefault().getJ2eePlatform(serverInstanceIDs[i]); if (j2eePlatform != null) { if (j2eePlatform.getSupportedModuleTypes().contains(moduleType) - && j2eePlatform.getSupportedSpecVersions(moduleType).contains(j2eeLevel)) { + && j2eePlatform.getSupportedProfiles(moduleType).contains(j2eeProfile)) { J2eePlatformAdapter adapter = new J2eePlatformAdapter(j2eePlatform, serverInstanceIDs[i]); orderedNames.add(adapter); @@ -224,15 +241,15 @@ private J2eePlatformComboBoxItem initialJ2eeSpecVersion; private J2eePlatformComboBoxItem selectedJ2eeSpecVersion; - public J2eeSpecVersionComboBoxModel(String j2eeSpecVersion) { - initialJ2eeSpecVersion = new J2eePlatformComboBoxItem(j2eeSpecVersion); + public J2eeSpecVersionComboBoxModel(Profile j2eeProfile) { + initialJ2eeSpecVersion = new J2eePlatformComboBoxItem(j2eeProfile); List orderedListItems = new ArrayList(); - orderedListItems.add(new J2eePlatformComboBoxItem(J2EEProjectProperties.JAVA_EE_5)); - orderedListItems.add(new J2eePlatformComboBoxItem(J2EEProjectProperties.J2EE_1_4)); - if (!J2EEProjectProperties.JAVA_EE_5.equals(initialJ2eeSpecVersion.getCode()) && - !J2EEProjectProperties.J2EE_1_4.equals(initialJ2eeSpecVersion.getCode())) { - orderedListItems.add(0, new J2eePlatformComboBoxItem(J2EEProjectProperties.J2EE_1_3)); + orderedListItems.add(new J2eePlatformComboBoxItem(Profile.JAVA_EE_5)); + orderedListItems.add(new J2eePlatformComboBoxItem(Profile.J2EE_14)); + if (!(Profile.JAVA_EE_5 == initialJ2eeSpecVersion.getProfile()) && + !(Profile.J2EE_14 == initialJ2eeSpecVersion.getProfile())) { + orderedListItems.add(0, new J2eePlatformComboBoxItem(Profile.J2EE_13)); } j2eeSpecVersions = orderedListItems.toArray(new J2eePlatformComboBoxItem[orderedListItems.size()]); @@ -257,41 +274,19 @@ } private static final class J2eePlatformComboBoxItem{ - private String code; - private String displayName; + private final Profile profile; - public J2eePlatformComboBoxItem (String code, String displayName){ - this.code = code; - this.displayName = displayName; + public J2eePlatformComboBoxItem (Profile profile){ + this.profile = profile; } - public J2eePlatformComboBoxItem (String code){ - this(code, findDisplayName(code)); - } - - private static String findDisplayName(String code){ - if (code == null) { - return ""; - } - if(code.equals(J2EEProjectProperties.JAVA_EE_5)) { - return JAVA_EE_5_DISPLAY_NAME; - } - if(code.equals(J2EEProjectProperties.J2EE_1_4)) { - return J2EE_1_4_DISPLAY_NAME; - } - if(code.equals(J2EEProjectProperties.J2EE_1_3)) { - return J2EE_1_3_DISPLAY_NAME; - } - return code; //version display name not found, use the version code for display name - } - - public String getCode(){ - return code; + public Profile getProfile() { + return profile; } @Override public String toString(){ - return displayName; + return profile.getDisplayName(); } } diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eeVersionWarningPanel.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eeVersionWarningPanel.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eeVersionWarningPanel.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/J2eeVersionWarningPanel.java @@ -46,6 +46,7 @@ import org.netbeans.api.java.platform.Specification; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.common.project.ui.UserProjectSettings; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.openide.modules.SpecificationVersion; /** @@ -134,26 +135,26 @@ } return javaPlatformName; } - - public static String findWarningType(String j2eeLevel) { + + public static String findWarningType(Profile j2eeProfile) { // System.out.println("findWarningType: j2eeLevel="+j2eeLevel); JavaPlatform defaultPlatform = JavaPlatformManager.getDefault().getDefaultPlatform(); SpecificationVersion version = defaultPlatform.getSpecification().getVersion(); String sourceLevel = version.toString(); // #89131: these levels are not actually distinct from 1.5. if (sourceLevel.equals("1.6") || sourceLevel.equals("1.7")) - sourceLevel = "1.5"; + sourceLevel = "1.5"; // System.out.println("default platform is "+version); - + // no warning if 1.4 is the default for j2ee14 - if (new SpecificationVersion("1.4").equals(version) && j2eeLevel.equals(J2eeModule.J2EE_14)) // NOI18N + if (new SpecificationVersion("1.4").equals(version) && j2eeProfile == Profile.J2EE_14) // NOI18N return null; - + // no warning if 1.5, 1.6, 1.7 is the default for j2ee15 - if ("1.5".equals(sourceLevel) && j2eeLevel.equals(J2eeModule.JAVA_EE_5)) // NOI18N + if ("1.5".equals(sourceLevel) && j2eeProfile == Profile.JAVA_EE_5) // NOI18N return null; - - if (j2eeLevel.equals(J2eeModule.J2EE_14)) { + + if (j2eeProfile == Profile.J2EE_14) { JavaPlatform[] java14Platforms = getJavaPlatforms("1.4"); //NOI18N if (java14Platforms.length > 0) { // the user has JDK 1.4, so we warn we'll downgrade to 1.4 @@ -162,7 +163,7 @@ // no JDK 1.4, the best we can do is downgrade the source level to 1.4 return WARN_SET_SOURCE_LEVEL_14; } - } else if (j2eeLevel.equals(J2eeModule.JAVA_EE_5)) { + } else if (j2eeProfile == Profile.JAVA_EE_5) { JavaPlatform[] java15Platforms = getJavaPlatforms("1.5"); //NOI18N if (java15Platforms.length > 0) { // the user has JDK 1.4, so we warn we'll downgrade to 1.4 @@ -176,6 +177,11 @@ return null; } } + + @Deprecated + public static String findWarningType(String j2eeLevel) { + return findWarningType(Profile.fromPropertiesString(j2eeLevel)); + } private static JavaPlatform[] getJavaPlatforms(String level) { return JavaPlatformManager.getDefault().getPlatforms(null, new Specification("J2SE", new SpecificationVersion(level))); // NOI18N diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.form b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.form --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.form +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.form @@ -12,6 +12,7 @@ + @@ -32,20 +33,20 @@ - + - + - + - + @@ -56,7 +57,7 @@ - + @@ -76,11 +77,11 @@ - + - + diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/project/ui/ProjectServerPanel.java @@ -65,6 +65,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.ServerManager; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeApplicationProvider; import org.netbeans.modules.j2ee.common.project.ui.UserProjectSettings; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.spi.project.support.ant.PropertyUtils; import org.openide.WizardDescriptor; import org.openide.filesystems.FileObject; @@ -82,10 +83,6 @@ private J2eeVersionWarningPanel warningPanel; private boolean sharableProject; - - private static final String J2EE_SPEC_13_LABEL = NbBundle.getMessage(ProjectServerPanel.class, "J2EESpecLevel_13"); //NOI18N - private static final String J2EE_SPEC_14_LABEL = NbBundle.getMessage(ProjectServerPanel.class, "J2EESpecLevel_14"); //NOI18N - private static final String JAVA_EE_SPEC_50_LABEL = NbBundle.getMessage(ProjectServerPanel.class, "JavaEESpecLevel_50"); //NOI18N private List earProjects; private Object j2eeModuleType; @@ -385,18 +382,18 @@ if (serverInstanceWrapper != null) { selectedServerInstanceID = serverInstanceWrapper.getServerInstanceID(); } - String lastSelectedJ2eeSpecLevel = (String) j2eeSpecComboBox.getSelectedItem(); + ProfileItem lastSelectedJ2eeProfile = (ProfileItem) j2eeSpecComboBox.getSelectedItem(); String newServerInstanceID = ServerManager.showAddServerInstanceWizard(); if (newServerInstanceID != null) { selectedServerInstanceID = newServerInstanceID; // clear the spec level selection - lastSelectedJ2eeSpecLevel = null; + lastSelectedJ2eeProfile = null; j2eeSpecComboBox.setSelectedItem(null); } // refresh the list of servers initServers(selectedServerInstanceID); - if (lastSelectedJ2eeSpecLevel != null) { - j2eeSpecComboBox.setSelectedItem(lastSelectedJ2eeSpecLevel); + if (lastSelectedJ2eeProfile != null) { + j2eeSpecComboBox.setSelectedItem(lastSelectedJ2eeProfile); } }//GEN-LAST:event_addServerButtonActionPerformed @@ -405,27 +402,20 @@ }//GEN-LAST:event_j2eeSpecComboBoxActionPerformed private void serverInstanceComboBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_serverInstanceComboBoxActionPerformed - String prevSelectedItem = (String) j2eeSpecComboBox.getSelectedItem(); + ProfileItem prevSelectedItem = (ProfileItem) j2eeSpecComboBox.getSelectedItem(); // update the j2ee spec list according to the selected server ServerInstanceWrapper serverInstanceWrapper = (ServerInstanceWrapper) serversModel.getSelectedItem(); + j2eeSpecComboBox.removeAllItems(); if (serverInstanceWrapper != null) { J2eePlatform j2eePlatform = Deployment.getDefault().getJ2eePlatform(serverInstanceWrapper.getServerInstanceID()); - Set supportedVersions = j2eePlatform.getSupportedSpecVersions(j2eeModuleType); - j2eeSpecComboBox.removeAllItems(); - if (supportedVersions.contains(J2eeModule.JAVA_EE_5)) { - j2eeSpecComboBox.addItem(JAVA_EE_SPEC_50_LABEL); - } - if (supportedVersions.contains(J2eeModule.J2EE_14)) { - j2eeSpecComboBox.addItem(J2EE_SPEC_14_LABEL); - } - if (supportedVersions.contains(J2eeModule.J2EE_13)) { - j2eeSpecComboBox.addItem(J2EE_SPEC_13_LABEL); + Set profiles = new TreeSet(Profile.REVERSE_COMPARATOR); + profiles.addAll(j2eePlatform.getSupportedProfiles(j2eeModuleType)); + for (Profile profile : profiles) { + j2eeSpecComboBox.addItem(new ProfileItem(profile)); } if (prevSelectedItem != null) { j2eeSpecComboBox.setSelectedItem(prevSelectedItem); } - } else { - j2eeSpecComboBox.removeAllItems(); } // revalidate the form wizard.fireChangeEvent(); @@ -548,7 +538,7 @@ void store(WizardDescriptor d) { d.putProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID, getSelectedServer()); - d.putProperty(ProjectServerWizardPanel.J2EE_LEVEL, getSelectedJ2eeSpec()); + d.putProperty(ProjectServerWizardPanel.J2EE_LEVEL, getSelectedJ2eeProfile()); d.putProperty(ProjectServerWizardPanel.CONTEXT_PATH, jTextFieldContextPath.getText().trim()); d.putProperty(ProjectServerWizardPanel.EAR_APPLICATION, getSelectedEarApplication()); d.putProperty(ProjectServerWizardPanel.WAR_NAME, jTextFieldWebAppName.getText()); @@ -564,7 +554,7 @@ if (warningPanel != null && warningPanel.getDowngradeAllowed()) { d.putProperty(ProjectServerWizardPanel.JAVA_PLATFORM, warningPanel.getSuggestedJavaPlatformName()); - String j2ee = getSelectedJ2eeSpec(); + Profile j2ee = getSelectedJ2eeProfile(); if (j2ee != null) { String warningType = J2eeVersionWarningPanel.findWarningType(j2ee); UserProjectSettings fls = UserProjectSettings.getDefault(); @@ -701,11 +691,9 @@ } } - private String getSelectedJ2eeSpec() { - Object item = j2eeSpecComboBox.getSelectedItem(); - return item == null ? null - : item.equals(JAVA_EE_SPEC_50_LABEL) ? J2eeModule.JAVA_EE_5 : - ( item.equals(J2EE_SPEC_14_LABEL) ? J2eeModule.J2EE_14 : J2eeModule.J2EE_13); + private Profile getSelectedJ2eeProfile() { + ProfileItem item = (ProfileItem) j2eeSpecComboBox.getSelectedItem(); + return item == null ? null : item.getProfile(); } private String getSelectedServer() { @@ -749,7 +737,7 @@ } private void setJ2eeVersionWarningPanel() { - String j2ee = getSelectedJ2eeSpec(); + Profile j2ee = getSelectedJ2eeProfile(); if (j2ee == null) { warningPlaceHolderPanel.setVisible(false); return; @@ -810,7 +798,7 @@ } } else { // suppose highest - j2eeSpecComboBox.setSelectedItem(JAVA_EE_SPEC_50_LABEL); + j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.JAVA_EE_5)); } } } @@ -835,9 +823,9 @@ } if(new BigDecimal(org.netbeans.modules.j2ee.dd.api.ejb.EjbJar.VERSION_2_0).equals(version)) { - j2eeSpecComboBox.setSelectedItem(J2EE_SPEC_13_LABEL); + j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.J2EE_13)); } else if(new BigDecimal(org.netbeans.modules.j2ee.dd.api.ejb.EjbJar.VERSION_2_1).equals(version)) { - j2eeSpecComboBox.setSelectedItem(J2EE_SPEC_14_LABEL); + j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.J2EE_14)); } } catch (IOException e) { String message = NbBundle.getMessage(ProjectServerPanel.class, "MSG_EjbJarXmlCorrupted"); // NOI18N @@ -862,11 +850,11 @@ } if (new BigDecimal(org.netbeans.modules.j2ee.dd.api.client.AppClient.VERSION_1_3).equals(version)) { - j2eeSpecComboBox.setSelectedItem(J2EE_SPEC_13_LABEL); + j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.J2EE_13)); } else if(new BigDecimal(org.netbeans.modules.j2ee.dd.api.client.AppClient.VERSION_1_4).equals(version)) { - j2eeSpecComboBox.setSelectedItem(J2EE_SPEC_14_LABEL); + j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.J2EE_14)); } else if(new BigDecimal(org.netbeans.modules.j2ee.dd.api.client.AppClient.VERSION_5_0).equals(version)) { - j2eeSpecComboBox.setSelectedItem(JAVA_EE_SPEC_50_LABEL); + j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.JAVA_EE_5)); } } catch (IOException e) { String message = NbBundle.getMessage(ProjectServerPanel.class, "MSG_AppClientXmlCorrupted"); // NOI18N @@ -876,9 +864,10 @@ private void setJ2eeVersionWarning(WizardDescriptor d) { String errorMessage; - String selectedItem = (String)j2eeSpecComboBox.getSelectedItem(); + ProfileItem selectedItem = (ProfileItem) j2eeSpecComboBox.getSelectedItem(); - if (J2EE_SPEC_14_LABEL.equals(selectedItem) && new BigDecimal(org.netbeans.modules.j2ee.dd.api.ejb.EjbJar.VERSION_2_0).equals(xmlVersion)) { + if ((Profile.J2EE_14 == selectedItem.getProfile()) + && new BigDecimal(org.netbeans.modules.j2ee.dd.api.ejb.EjbJar.VERSION_2_0).equals(xmlVersion)) { errorMessage = NbBundle.getMessage(ProjectServerPanel.class, "MSG_EjbJarXMLNotSupported"); } else { errorMessage = null; @@ -937,4 +926,45 @@ public HelpCtx getHelpCtx() { return new HelpCtx(ProjectImportLocationPanel.generateHelpID(ProjectServerPanel.class, j2eeModuleType)); } + + private static class ProfileItem { + + private final Profile profile; + + public ProfileItem(Profile profile) { + this.profile = profile; + } + + public Profile getProfile() { + return profile; + } + + @Override + public String toString() { + return profile.getDisplayName(); + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final ProfileItem other = (ProfileItem) obj; + if (this.profile != other.profile && (this.profile == null || !this.profile.equals(other.profile))) { + return false; + } + return true; + } + + @Override + public int hashCode() { + int hash = 7; + hash = 97 * hash + (this.profile != null ? this.profile.hashCode() : 0); + return hash; + } + + } } diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerSupport.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerSupport.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerSupport.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerSupport.java @@ -44,10 +44,10 @@ import java.awt.Dialog; import javax.swing.JButton; import javax.swing.SwingUtilities; -import org.netbeans.modules.j2ee.common.*; import org.netbeans.modules.j2ee.common.ui.NoSelectedServerWarning; import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.openide.DialogDescriptor; import org.openide.DialogDisplayer; import org.openide.util.NbBundle; @@ -91,6 +91,7 @@ * @param j2eeSpec one of {@link J2eeModule#EJB}, {@link J2eeModule#EAR} * @param moduleType * @return selected application server. Might be null. + * @deprecated */ public static String selectServer(final String j2eeSpec, final Object moduleType) { return NoSelectedServerWarning.selectServerDialog( @@ -99,6 +100,13 @@ NbBundle.getMessage(BrokenServerSupport.class, "ACSD_Resolve_Missing_Server")); // NOI18N } + public static String selectServer(final Profile j2eeProfile, final Object moduleType) { + return NoSelectedServerWarning.selectServerDialog( + new Object[] { moduleType }, j2eeProfile, + NbBundle.getMessage(BrokenServerSupport.class, "LBL_Resolve_Missing_Server_Title"), + NbBundle.getMessage(BrokenServerSupport.class, "ACSD_Resolve_Missing_Server")); // NOI18N + } + /** * Show alert message box informing user that a project has missing * server. This method can be safely called from any thread, e.g. during diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.form b/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.form --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.form +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.form @@ -1,12 +1,14 @@ - + + + @@ -105,7 +107,7 @@ - + diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.java b/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.java --- a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.java +++ b/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.java @@ -53,8 +53,8 @@ import javax.swing.ListSelectionModel; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import org.netbeans.modules.j2ee.common.Util; import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.api.ServerManager; import org.openide.DialogDescriptor; import org.openide.DialogDisplayer; @@ -65,17 +65,17 @@ * * @author Pavel Buzek */ -public final class NoSelectedServerWarning extends JPanel { +final class NoSelectedServerWarning extends JPanel { public static final String OK_ENABLED = "ok_enabled"; //NOI18N - private final String j2eeSpec; + private final Profile j2eeProfile; - private NoSelectedServerWarning(Object[] moduleTypes, String j2eeSpec) { - this.j2eeSpec = j2eeSpec; + private NoSelectedServerWarning(Object[] moduleTypes, Profile j2eeProfile) { + this.j2eeProfile = j2eeProfile; initComponents(); - serverList.setModel(new ServerListModel(moduleTypes, j2eeSpec)); + serverList.setModel(new ServerListModel(moduleTypes, j2eeProfile)); if (serverList.getModel().getSize() > 0) { jTextArea2.setVisible(false); } @@ -105,9 +105,14 @@ * * @return serverInstanceId of the selected server instance, null * if canceled. + * @deprecated */ public static String selectServerDialog(Object[] moduleTypes, String j2eeSpec, String title, String description) { - NoSelectedServerWarning panel = new NoSelectedServerWarning(moduleTypes, j2eeSpec); + return selectServerDialog(moduleTypes, Profile.fromPropertiesString(j2eeSpec), title, description); + } + + public static String selectServerDialog(Object[] moduleTypes, Profile j2eeProfile, String title, String description) { + NoSelectedServerWarning panel = new NoSelectedServerWarning(moduleTypes, j2eeProfile); Object[] options = new Object[] { DialogDescriptor.OK_OPTION, DialogDescriptor.CANCEL_OPTION @@ -161,7 +166,7 @@ * WARNING: Do NOT modify this code. The content of this method is * always regenerated by the Form Editor. */ - // //GEN-BEGIN:initComponents + // //GEN-BEGIN:initComponents private void initComponents() { java.awt.GridBagConstraints gridBagConstraints; @@ -239,7 +244,7 @@ jButtonAddServer.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(NoSelectedServerWarning.class, "ACSN_AddServer")); // NOI18N jButtonAddServer.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(NoSelectedServerWarning.class, "ACSD_AddServer")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(listLabel, org.openide.util.NbBundle.getMessage(NoSelectedServerWarning.class, "LBL_NoSelectedServerWarning_listLabel", new Object[] {Util.getJ2eeSpecificationLabel(j2eeSpec)})); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(listLabel, org.openide.util.NbBundle.getMessage(NoSelectedServerWarning.class, "LBL_NoSelectedServerWarning_listLabel", new Object[] {j2eeProfile.getDisplayName()})); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 2; @@ -286,12 +291,12 @@ private String[] instances; private final Object[] moduleTypes; - private final String j2eeSpec; + private final Profile j2eeProfile; - public ServerListModel(Object[] moduleTypes, String j2eeSpec) { + public ServerListModel(Object[] moduleTypes, Profile j2eeProfile) { this.moduleTypes = moduleTypes; - this.j2eeSpec = j2eeSpec; - instances = Deployment.getDefault().getServerInstanceIDs(moduleTypes, j2eeSpec); + this.j2eeProfile = j2eeProfile; + instances = Deployment.getDefault().getServerInstanceIDs(moduleTypes, j2eeProfile); } public synchronized int getSize() { @@ -308,7 +313,7 @@ public synchronized void refreshModel() { int oldLength = instances.length; - instances = Deployment.getDefault().getServerInstanceIDs(moduleTypes, j2eeSpec); + instances = Deployment.getDefault().getServerInstanceIDs(moduleTypes, j2eeProfile); if (instances.length > 0) { fireContentsChanged(this, 0, instances.length - 1); } else if (oldLength > 0) { diff --git a/j2ee.earproject/nbproject/project.xml b/j2ee.earproject/nbproject/project.xml --- a/j2ee.earproject/nbproject/project.xml +++ b/j2ee.earproject/nbproject/project.xml @@ -135,7 +135,7 @@ 1 - 1.36 + 1.38 @@ -152,7 +152,7 @@ - 1.1 + 1.16 @@ -170,7 +170,7 @@ 4 - 1.54 + 1.58 diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProject.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProject.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProject.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProject.java @@ -67,6 +67,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; import org.netbeans.modules.j2ee.earproject.classpath.ClassPathProviderImpl; import org.netbeans.modules.j2ee.earproject.classpath.ClassPathSupportCallbackImpl; @@ -640,8 +641,13 @@ return helper.getStandardPropertyEvaluator().getProperty(EarProjectProperties.J2EE_SERVER_INSTANCE); } + @Deprecated public String getJ2eePlatformVersion() { - return helper.getStandardPropertyEvaluator().getProperty(EarProjectProperties.J2EE_PLATFORM); + return helper.getStandardPropertyEvaluator().getProperty(EarProjectProperties.J2EE_PLATFORM); + } + + public Profile getJ2eeProfile() { + return Profile.fromPropertiesString(helper.getStandardPropertyEvaluator().getProperty(EarProjectProperties.J2EE_PLATFORM)); } public GeneratedFilesHelper getGeneratedFilesHelper() { diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectGenerator.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectGenerator.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectGenerator.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectGenerator.java @@ -58,6 +58,7 @@ import org.netbeans.api.project.ProjectUtils; import org.netbeans.api.project.ant.AntArtifact; import org.netbeans.api.project.ant.AntArtifactQuery; +import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectCreateData; import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectGenerator; import org.netbeans.modules.j2ee.common.SharabilityUtility; import org.netbeans.modules.java.api.common.classpath.ClassPathSupport; @@ -69,8 +70,10 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.ui.customizer.EarProjectProperties; import org.netbeans.modules.j2ee.earproject.util.EarProjectUtil; +import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectCreateData; import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectGenerator; import org.netbeans.modules.web.project.api.WebProjectCreateData; import org.netbeans.modules.web.project.api.WebProjectUtilities; @@ -109,19 +112,19 @@ private final File prjDir; private final String name; - private final String j2eeLevel; + private final Profile j2eeProfile; private final String serverInstanceID; private final String sourceLevel; private final FileObject prjDirFO; private String librariesDefinition; private String serverLibraryName; - private EarProjectGenerator(File prjDir, FileObject prjDirFO, String name, String j2eeLevel, + private EarProjectGenerator(File prjDir, FileObject prjDirFO, String name, Profile j2eeProfile, String serverInstanceID, String sourceLevel, String librariesDefinition, String serverLibraryName) { this.prjDir = prjDir; this.prjDirFO = prjDirFO; this.name = name; - this.j2eeLevel = j2eeLevel; + this.j2eeProfile = j2eeProfile; this.serverInstanceID = serverInstanceID; // #89131: these levels are not actually distinct from 1.5. if (sourceLevel != null && (sourceLevel.equals("1.6") || sourceLevel.equals("1.7"))) @@ -139,10 +142,10 @@ * @return the helper object permitting it to be further customized * @throws IOException in case something went wrong */ - public static AntProjectHelper createProject(File prjDir, String name, String j2eeLevel, + public static AntProjectHelper createProject(File prjDir, String name, Profile j2eeProfile, String serverInstanceId, String sourceLevel, String librariesDefinition, String serverLibraryName) throws IOException { FileObject projectDir = FileUtil.createFolder(prjDir); - final EarProjectGenerator earGen = new EarProjectGenerator(prjDir, projectDir, name, j2eeLevel, + final EarProjectGenerator earGen = new EarProjectGenerator(prjDir, projectDir, name, j2eeProfile, serverInstanceId, sourceLevel, librariesDefinition, serverLibraryName); final AntProjectHelper[] h = new AntProjectHelper[1]; @@ -157,13 +160,13 @@ } public static AntProjectHelper importProject(File pDir, final File sDir, String name, - String j2eeLevel, String serverInstanceID, final String platformName, + Profile j2eeProfile, String serverInstanceID, final String platformName, String sourceLevel, final Map userModules, String librariesDefinition, String serverLibraryName) throws IOException { FileObject projectDir = FileUtil.createFolder(pDir); final EarProjectGenerator earGen = new EarProjectGenerator(pDir, projectDir, name, - j2eeLevel, serverInstanceID, sourceLevel, librariesDefinition, serverLibraryName); + j2eeProfile, serverInstanceID, sourceLevel, librariesDefinition, serverLibraryName); final AntProjectHelper[] h = new AntProjectHelper[1]; // create project in one FS atomic action: @@ -204,7 +207,7 @@ } EarProject earProject = p.getLookup().lookup(EarProject.class); assert earProject != null; - setupDD(j2eeLevel, docBase, earProject); + setupDD(j2eeProfile, docBase, earProject); return h; } @@ -292,7 +295,7 @@ } } - setupDD(j2eeLevel, docBase, earProject); + setupDD(j2eeProfile, docBase, earProject); if (userModules == null || userModules.isEmpty()) { userModules = ModuleType.detectModules(srcPrjDirFO); @@ -414,11 +417,17 @@ private AntProjectHelper addAppClientModule(final FileObject javaRoot, final FileObject subprojectRoot, final File subProjDir, final String platformName) throws IOException { FileObject docBaseFO = FileUtil.createFolder(subprojectRoot, DEFAULT_DOC_BASE_FOLDER); File docBase = FileUtil.toFile(docBaseFO); - AntProjectHelper subProjHelper = AppClientProjectGenerator.importProject( - subProjDir, subprojectRoot.getName(), - new File[] { FileUtil.toFile(javaRoot) }, - new File[0], docBase, - null, checkJ2eeVersion(j2eeLevel, serverInstanceID, J2eeModule.CLIENT), serverInstanceID); + + AppClientProjectCreateData createData = new AppClientProjectCreateData(); + createData.setProjectDir(subProjDir); + createData.setName(subprojectRoot.getName()); + createData.setSourceFolders(new File[] { FileUtil.toFile(javaRoot) }); + createData.setTestFolders(new File[0]); + createData.setConfFolder(docBase); + createData.setJavaEEProfile(getAcceptableProfile(j2eeProfile, serverInstanceID, J2eeModule.CLIENT)); + createData.setServerInstanceID(serverInstanceID); + + AntProjectHelper subProjHelper = AppClientProjectGenerator.importProject(createData); if (platformName != null || sourceLevel != null) { AppClientProjectGenerator.setPlatform(subProjHelper, platformName, sourceLevel); } @@ -428,11 +437,17 @@ private AntProjectHelper addEJBModule(final FileObject javaRoot, final FileObject subprojectRoot, final File subProjDir, final String platformName) throws IOException { FileObject docBaseFO = FileUtil.createFolder(subprojectRoot, DEFAULT_DOC_BASE_FOLDER); File docBase = FileUtil.toFile(docBaseFO); - AntProjectHelper subProjHelper = EjbJarProjectGenerator.importProject( - subProjDir, subprojectRoot.getName(), - new File[] {FileUtil.toFile(javaRoot)}, - new File[0], docBase, - null, checkJ2eeVersion(j2eeLevel, serverInstanceID, J2eeModule.EJB), serverInstanceID); + + EjbJarProjectCreateData createData = new EjbJarProjectCreateData(); + createData.setProjectDir(subProjDir); + createData.setName(subprojectRoot.getName()); + createData.setSourceFolders(new File[] {FileUtil.toFile(javaRoot)}); + createData.setTestFolders(new File[0]); + createData.setConfigFilesBase(docBase); + createData.setJavaEEProfile(getAcceptableProfile(j2eeProfile, serverInstanceID, J2eeModule.EJB)); + createData.setServerInstanceID(serverInstanceID); + + AntProjectHelper subProjHelper = EjbJarProjectGenerator.importProject(createData); if (platformName != null || sourceLevel != null) { EjbJarProjectGenerator.setPlatform(subProjHelper, platformName, sourceLevel); } @@ -448,7 +463,7 @@ createData.setTestFolders(new File[0]); createData.setDocBase(FileUtil.createFolder(subprojectRoot, "web")); //NOI18N createData.setLibFolder(null); - createData.setJavaEEVersion(checkJ2eeVersion(j2eeLevel, serverInstanceID, J2eeModule.WAR)); + createData.setJavaEEProfile(getAcceptableProfile(j2eeProfile, serverInstanceID, J2eeModule.WAR)); createData.setServerInstanceID(serverInstanceID); createData.setBuildfile("build.xml"); //NOI18N createData.setJavaPlatformName(platformName); @@ -458,17 +473,22 @@ return WebProjectUtilities.importProject(createData); } - static FileObject setupDD(final String j2eeLevel, final FileObject docBase, + static FileObject setupDD(final Profile j2eeProfile, final FileObject docBase, final EarProject earProject) throws IOException { - return setupDD(j2eeLevel, docBase, earProject, false); + return setupDD(j2eeProfile, docBase, earProject, false); } + @Deprecated + public static FileObject setupDD(final String j2eeLevel, final FileObject docBase, + final Project earProject, boolean force) throws IOException { + return setupDD(Profile.fromPropertiesString(j2eeLevel), docBase, earProject, force); + } /** * Generate deployment descriptor (application.xml) if needed or forced (applies for JAVA EE 5). *

* For J2EE 1.4 or older the deployment descriptor is always generated if missing. * For JAVA EE 5 it is only generated if missing and forced as well. - * @param j2eeLevel J2EE level, see {@link J2eeModule J2eeModule constants}. + * @param j2eeprofile J2EE profile. * @param docBase Configuration directory. * @param earProject EAR project instance. * @param force if true application.xml is generated even if it's not needed @@ -476,7 +496,7 @@ * @return {@link FileObject} of the deployment descriptor or null. * @throws java.io.IOException if any error occurs. */ - public static FileObject setupDD(final String j2eeLevel, final FileObject docBase, + public static FileObject setupDD(final Profile j2eeProfile, final FileObject docBase, final Project earProject, boolean force) throws IOException { FileObject dd = docBase.getFileObject(ProjectEar.FILE_DD); if (dd != null) { @@ -486,7 +506,7 @@ if (EarProjectUtil.isDDCompulsory(earProject)) { template = FileUtil.getConfigFile( "org-netbeans-modules-j2ee-earproject/ear-1.4.xml"); // NOI18N - } else if (J2eeModule.JAVA_EE_5.equals(j2eeLevel)) { + } else if (Profile.JAVA_EE_5.equals(j2eeProfile)) { if (force) { template = FileUtil.getConfigFile( "org-netbeans-modules-j2ee-earproject/ear-5.xml"); // NOI18N @@ -504,7 +524,7 @@ "If it\'s *really* needed, set force param to true." + newLine); } } else { - assert false : "Unknown j2eeLevel: " + j2eeLevel; + assert false : "Unknown j2eeProfile: " + j2eeProfile; } if (template != null) { dd = FileUtil.copyFile(template, docBase, "application"); // NOI18N @@ -528,13 +548,13 @@ * For now the only check is to use J2EE 1.4 if JavaEE5 is not supported. * Otherwise use the requestedVersion. */ - public static String checkJ2eeVersion(String requestedVersion, String serverInstanceID, Object moduleType) { + public static Profile getAcceptableProfile(Profile requestedProfile, String serverInstanceID, Object moduleType) { J2eePlatform platform = Deployment.getDefault().getJ2eePlatform(serverInstanceID); - Set versions = platform.getSupportedSpecVersions(moduleType); - if (!versions.contains(requestedVersion) && (versions.contains(J2eeModule.J2EE_14))) { - return J2eeModule.J2EE_14; + Set profiles = platform.getSupportedProfiles(moduleType); + if (!profiles.contains(requestedProfile) && (profiles.contains(Profile.J2EE_14))) { + return Profile.J2EE_14; } - return requestedVersion; + return requestedProfile; } private static String relativePath(FileObject parent, FileObject child) { @@ -575,7 +595,7 @@ ep.setProperty(EarProjectProperties.DIST_DIR, "dist"); // NOI18N ep.setProperty(EarProjectProperties.DIST_JAR, "${" + EarProjectProperties.DIST_DIR + "}/${" + EarProjectProperties.JAR_NAME + "}"); // NOI18N - ep.setProperty(EarProjectProperties.J2EE_PLATFORM, j2eeLevel); + ep.setProperty(EarProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); ep.setProperty(EarProjectProperties.JAR_NAME, name + ".ear"); // NOI18N ep.setProperty(EarProjectProperties.JAR_COMPRESS, "false"); // NOI18N diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ProjectEar.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ProjectEar.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ProjectEar.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ProjectEar.java @@ -74,6 +74,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeApplication; import org.netbeans.modules.j2ee.deployment.devmodules.api.ModuleChangeReporter; import org.netbeans.modules.j2ee.deployment.devmodules.api.ModuleListener; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.spi.ArtifactListener; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeApplicationProvider; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeApplicationImplementation; @@ -262,7 +263,7 @@ private Application getDDFromFile() throws IOException { FileObject dd = getDeploymentDescriptor(); if (dd == null) { - dd = EarProjectGenerator.setupDD(project.getJ2eePlatformVersion(), getMetaInf(), project); + dd = EarProjectGenerator.setupDD(project.getJ2eeProfile(), getMetaInf(), project); } return DDProvider.getDefault().getDDRoot(dd); } @@ -348,8 +349,13 @@ return new String[] {}; } + // FIXME mix of two apis public String getJ2eePlatformVersion () { - return project.getJ2eePlatformVersion(); // helper.getStandardPropertyEvaluator ().getProperty (EarProjectProperties.J2EE_PLATFORM); + return project.getJ2eePlatformVersion(); + } + + public Profile getJ2eeProfile() { + return project.getJ2eeProfile(); } @Override diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationMetadataModelImpl.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationMetadataModelImpl.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationMetadataModelImpl.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationMetadataModelImpl.java @@ -133,7 +133,7 @@ && EarProjectUtil.isDDCompulsory(earProject)) { try { ddFO = EarProjectGenerator.setupDD( - earProject.getJ2eePlatformVersion(), + earProject.getJ2eeProfile(), earProject.getAppModule().getMetaInf(), earProject, true); diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java @@ -70,6 +70,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; import org.netbeans.modules.j2ee.earproject.EarProject; @@ -482,16 +483,16 @@ } public void actionPerformed(ActionEvent e) { - String j2eeSpec = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH). - getProperty(EarProjectProperties.J2EE_PLATFORM); - if (j2eeSpec == null) { - j2eeSpec = J2EEProjectProperties.JAVA_EE_5; // NOI18N + Profile j2eeProfile = Profile.fromPropertiesString(helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH). + getProperty(EarProjectProperties.J2EE_PLATFORM)); + if (j2eeProfile == null) { + j2eeProfile = Profile.JAVA_EE_5; Logger.getLogger(J2eeArchiveLogicalViewProvider.class.getName()).warning( "project ["+project.getProjectDirectory()+"] is missing "+EarProjectProperties.J2EE_PLATFORM+". " + // NOI18N - "default value will be used instead: "+j2eeSpec); // NOI18N - updateJ2EESpec(project, project.getAntProjectHelper(), j2eeSpec); + "default value will be used instead: "+j2eeProfile); // NOI18N + updateJ2EESpec(project, project.getAntProjectHelper(), j2eeProfile); } - String instance = BrokenServerSupport.selectServer(j2eeSpec, J2eeModule.EAR); + String instance = BrokenServerSupport.selectServer(j2eeProfile, J2eeModule.EAR); if (instance != null) { EarProjectProperties.setServerInstance( project, helper, instance); @@ -499,12 +500,12 @@ checkMissingServer(); } - private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final String j2eeSpec) { + private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final Profile j2eeProfile) { ProjectManager.mutex().postWriteRequest(new Runnable() { public void run() { try { EditableProperties projectProps = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); - projectProps.put(EarProjectProperties.J2EE_PLATFORM, j2eeSpec); + projectProps.put(EarProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); helper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, projectProps); ProjectManager.getDefault().saveProject(project); } catch (IOException e) { diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle.properties b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle.properties --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle.properties +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle.properties @@ -171,11 +171,6 @@ MSG_AACH_RefToItself=Cannot add reference to itself. MSG_AACH_Cycles=Cannot add cyclic references. -# J2EE Specification levels -J2EESpecLevel_13=J2EE 1.3 -J2EESpecLevel_14=J2EE 1.4 -JavaEESpecLevel_50=Java EE 5 - # EarProjectProperties - modified bulid-impl.xml TXT_Regenerate=

The "build-impl.xml" file was modified externally.


\

The IDE automatically generates this file whenever you edit project
\ diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.form b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.form --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.form +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.form @@ -27,11 +27,8 @@ - - - - - + + @@ -40,7 +37,7 @@ - + @@ -87,7 +84,7 @@ - + @@ -147,7 +144,7 @@ - + @@ -238,10 +235,7 @@ - - - - + diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.java @@ -59,6 +59,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.api.ServerInstance; import org.netbeans.modules.j2ee.earproject.EarProject; import org.netbeans.spi.project.support.ant.AntProjectHelper; @@ -124,11 +125,9 @@ clientModuleUriCombo.setModel(uiProperties.CLIENT_MODULE_MODEL); jCheckBoxDeployOnSave.setModel(uiProperties.DEPLOY_ON_SAVE_MODEL); - String j2eeVersion = uiProperties.getProject().getJ2eePlatformVersion(); - if (J2eeModule.JAVA_EE_5.equals(j2eeVersion)) { - jTextFieldVersion.setText(EarProjectProperties.JAVA_EE_SPEC_50_LABEL); - } else if (J2eeModule.J2EE_14.equals(j2eeVersion)) { - jTextFieldVersion.setText(EarProjectProperties.J2EE_SPEC_14_LABEL); + Profile j2eeProfile = uiProperties.getProject().getJ2eeProfile(); + if (j2eeProfile != null) { + jTextFieldVersion.setText(j2eeProfile.getDisplayName()); } setDeployOnSaveState(); handleWebModuleRelated(); @@ -147,9 +146,8 @@ } private int getLongestVersionLength() { - return Math.max( - EarProjectProperties.JAVA_EE_SPEC_50_LABEL.length(), - EarProjectProperties.J2EE_SPEC_14_LABEL.length()); + // FIXME fix UI to handle the case without this stuff :/ + return Profile.JAVA_EE_6_FULL.getDisplayName().length(); } /** This method is called from within the constructor to diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java @@ -123,11 +123,6 @@ */ public final class EarProjectProperties { - public static final String J2EE_SPEC_14_LABEL = - NbBundle.getMessage(EarProjectProperties.class, "J2EESpecLevel_14"); - public static final String JAVA_EE_SPEC_50_LABEL = - NbBundle.getMessage(EarProjectProperties.class, "JavaEESpecLevel_50"); - // Special properties of the project public static final String WEB_PROJECT_NAME = "web.project.name"; //NOI18N public static final String JAVA_PLATFORM = "platform.active"; //NOI18N diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIterator.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIterator.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIterator.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIterator.java @@ -58,6 +58,7 @@ import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; import org.netbeans.modules.j2ee.common.project.ui.UserProjectSettings; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.EarProjectGenerator; import org.netbeans.modules.j2ee.earproject.ModuleType; import org.openide.WizardDescriptor; @@ -120,7 +121,7 @@ srcF = FileUtil.normalizeFile(srcF); } String name = (String) wiz.getProperty(ProjectLocationWizardPanel.NAME); - String j2eeLevel = (String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); + Profile j2eeProfile = (Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); // String contextPath = (String) wiz.getProperty(WizardProperties.CONTEXT_PATH); String serverInstanceID = (String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID); String platformName = (String)wiz.getProperty(ProjectServerWizardPanel.JAVA_PLATFORM); @@ -131,18 +132,18 @@ String librariesDefinition = SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES)); String serverLibraryName = (String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY); - return testableInstantiate(platformName, sourceLevel, j2eeLevel, dirF, + return testableInstantiate(platformName, sourceLevel, j2eeProfile, dirF, srcF, serverInstanceID, name, userModules, handle, librariesDefinition, serverLibraryName); } /** Package private for unit test only. */ static Set testableInstantiate(final String platformName, - final String sourceLevel, final String j2eeLevel, final File dirF, + final String sourceLevel, final Profile j2eeProfile, final File dirF, final File srcF, final String serverInstanceID, final String name, final Map userModules, ProgressHandle handle, String librariesDefinition, String serverLibraryName) throws IOException { - EarProjectGenerator.importProject(dirF, srcF, name, j2eeLevel, + EarProjectGenerator.importProject(dirF, srcF, name, j2eeProfile, serverInstanceID, platformName, sourceLevel, userModules, librariesDefinition, serverLibraryName); if (handle != null) { diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIterator.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIterator.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIterator.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIterator.java @@ -55,6 +55,7 @@ import org.netbeans.api.progress.ProgressHandle; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; +import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectCreateData; import org.netbeans.modules.j2ee.clientproject.api.AppClientProjectGenerator; import org.netbeans.modules.j2ee.common.SharabilityUtility; import org.netbeans.modules.j2ee.common.project.ui.ProjectLocationWizardPanel; @@ -62,11 +63,13 @@ import org.netbeans.modules.j2ee.common.project.ui.UserProjectSettings; import org.netbeans.modules.j2ee.dd.api.application.Application; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.EarProject; import org.netbeans.modules.j2ee.earproject.EarProjectGenerator; import org.netbeans.modules.j2ee.earproject.ui.customizer.CustomizerRun; import org.netbeans.modules.j2ee.earproject.ui.customizer.EarProjectProperties; import org.netbeans.modules.j2ee.earproject.util.EarProjectUtil; +import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectCreateData; import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectGenerator; import org.netbeans.modules.web.api.webmodule.WebModule; import org.netbeans.modules.web.project.api.WebProjectCreateData; @@ -128,7 +131,7 @@ } String name = (String) wiz.getProperty(ProjectLocationWizardPanel.NAME); String serverInstanceID = (String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID); - String j2eeLevel = (String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); + Profile j2eeLevel = (Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); Boolean createWAR = (Boolean) wiz.getProperty(ProjectServerWizardPanel.CREATE_WAR); String warName = null; if (createWAR.booleanValue()) { @@ -161,12 +164,12 @@ } /** Package private for unit test only. */ - static Set testableInstantiate(File dirF, String name, String j2eeLevel, + static Set testableInstantiate(File dirF, String name, Profile j2eeProfile, String serverInstanceID, String warName, String ejbJarName, String carName, String mainClass, String platformName, String sourceLevel, ProgressHandle handle, String librariesDefinition, String serverLibraryName) throws IOException { Set resultSet = new LinkedHashSet(); - AntProjectHelper h = EarProjectGenerator.createProject(dirF, name, j2eeLevel, + AntProjectHelper h = EarProjectGenerator.createProject(dirF, name, j2eeProfile, serverInstanceID, sourceLevel, librariesDefinition, serverLibraryName); if (handle != null) handle.progress(2); @@ -200,18 +203,19 @@ Project webProject = null; if (null != warName) { File webAppDir = FileUtil.normalizeFile(new File(dirF, warName)); - + WebProjectCreateData createData = new WebProjectCreateData(); createData.setProjectDir(webAppDir); createData.setName(warName); createData.setServerInstanceID(serverInstanceID); createData.setSourceStructure(WebProjectUtilities.SRC_STRUCT_BLUEPRINTS); - createData.setJavaEEVersion(EarProjectGenerator.checkJ2eeVersion(j2eeLevel, serverInstanceID, J2eeModule.WAR)); + createData.setJavaEEProfile(EarProjectGenerator.getAcceptableProfile(j2eeProfile, serverInstanceID, J2eeModule.WAR)); createData.setContextPath('/' + warName); //NOI18N createData.setJavaPlatformName(platformName); createData.setSourceLevel(sourceLevel); createData.setLibrariesDefinition(librariesDefinition); createData.setServerLibraryName(serverLibraryName); + if (handle != null) handle.progress(NbBundle.getMessage(NewEarProjectWizardIterator.class, "LBL_NewEarProjectWizardIterator_WizardProgress_WAR"), 3); AntProjectHelper webHelper = WebProjectUtilities.createProject(createData); @@ -229,12 +233,19 @@ Project appClient = null; if (null != carName) { File carDir = FileUtil.normalizeFile(new File(dirF,carName)); + + AppClientProjectCreateData createData = new AppClientProjectCreateData(); + createData.setProjectDir(carDir); + createData.setName(carName); + createData.setMainClass(mainClass); + createData.setJavaEEProfile(EarProjectGenerator.getAcceptableProfile(j2eeProfile, serverInstanceID, J2eeModule.CLIENT)); + createData.setServerInstanceID(serverInstanceID); + createData.setLibrariesDefinition(librariesDefinition); + createData.setServerLibraryName(serverLibraryName); + if (handle != null) handle.progress(NbBundle.getMessage(NewEarProjectWizardIterator.class, "LBL_NewEarProjectWizardIterator_WizardProgress_AppClient"), 5); - AntProjectHelper clientHelper = AppClientProjectGenerator.createProject( - carDir, carName, mainClass, - EarProjectGenerator.checkJ2eeVersion(j2eeLevel, serverInstanceID, - J2eeModule.CLIENT), serverInstanceID, librariesDefinition, serverLibraryName); + AntProjectHelper clientHelper = AppClientProjectGenerator.createProject(createData); if (handle != null) handle.progress(6); @@ -249,11 +260,18 @@ } if (null != ejbJarName) { File ejbJarDir = FileUtil.normalizeFile(new File(dirF,ejbJarName)); + + EjbJarProjectCreateData createData = new EjbJarProjectCreateData(); + createData.setProjectDir(ejbJarDir); + createData.setName(ejbJarName); + createData.setJavaEEProfile(EarProjectGenerator.getAcceptableProfile(j2eeProfile, serverInstanceID, J2eeModule.EJB)); + createData.setServerInstanceID(serverInstanceID); + createData.setLibrariesDefinition(librariesDefinition); + createData.setServerLibraryName(serverLibraryName); + if (handle != null) handle.progress(NbBundle.getMessage(NewEarProjectWizardIterator.class, "LBL_NewEarProjectWizardIterator_WizardProgress_EJB"), 7); - AntProjectHelper ejbHelper = EjbJarProjectGenerator.createProject(ejbJarDir,ejbJarName, - EarProjectGenerator.checkJ2eeVersion(j2eeLevel, serverInstanceID, J2eeModule.EJB), - serverInstanceID, librariesDefinition, serverLibraryName); + AntProjectHelper ejbHelper = EjbJarProjectGenerator.createProject(createData); if (handle != null) handle.progress(8); diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/dd/ApplicationXmlWizardIterator.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/dd/ApplicationXmlWizardIterator.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/dd/ApplicationXmlWizardIterator.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/dd/ApplicationXmlWizardIterator.java @@ -111,6 +111,7 @@ EarImplementation projectEar = panel.getProject().getLookup().lookup(EarImplementation.class); if (confRoot != null && projectEar != null) { try { + // FIXME mix of two API constants FileObject dd = EarProjectGenerator.setupDD(projectEar.getJ2eePlatformVersion(), projectEar.getMetaInf(), panel.getProject(), true); return Collections.singleton(dd); diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectGeneratorTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectGeneratorTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectGeneratorTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectGeneratorTest.java @@ -48,6 +48,7 @@ import org.netbeans.api.project.ProjectManager; import org.netbeans.junit.NbTestCase; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.test.TestUtil; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.support.ant.EditableProperties; @@ -153,7 +154,7 @@ public void testCreateProjectJavaEE5() throws Exception { File prjDirF = new File(getWorkDir(), "EARProject"); AntProjectHelper aph = EarProjectGenerator.createProject(prjDirF, "test-project", - J2eeModule.JAVA_EE_5, serverID, "1.5", null, null); + Profile.JAVA_EE_5, serverID, "1.5", null, null); assertNotNull(aph); FileObject prjDirFO = aph.getProjectDirectory(); for (String file : CREATED_FILES) { @@ -179,7 +180,7 @@ public void testCreateProjectJ2EE14() throws Exception { File prjDirF = new File(getWorkDir(), "EARProject"); AntProjectHelper aph = EarProjectGenerator.createProject(prjDirF, "test-project", - J2eeModule.J2EE_14, serverID, "1.4", null, null); + Profile.J2EE_14, serverID, "1.4", null, null); assertNotNull(aph); FileObject prjDirFO = aph.getProjectDirectory(); for (String file : CREATED_FILES) { @@ -199,7 +200,7 @@ public void testImportProject() throws Exception { File prjDirF = new File(getWorkDir(), "EARProject"); AntProjectHelper helper = EarProjectGenerator.importProject(prjDirF, prjDirF, - "test-project-ext-src", J2eeModule.JAVA_EE_5, serverID, null, + "test-project-ext-src", Profile.JAVA_EE_5, serverID, null, "1.5", Collections.emptyMap(), null, null); assertNotNull(helper); FileObject prjDirFO = FileUtil.toFileObject(prjDirF); @@ -225,7 +226,7 @@ public void testProjectNameIsSet() throws Exception { // #73930 File prjDirF = new File(getWorkDir(), "EARProject"); EarProjectGenerator.createProject(prjDirF, "test-project", - J2eeModule.JAVA_EE_5, serverID, "1.5", null, null); + Profile.JAVA_EE_5, serverID, "1.5", null, null); // test also build final File buildXML = new File(prjDirF, "build.xml"); String projectName = ProjectManager.mutex().readAccess(new Mutex.ExceptionAction() { @@ -242,7 +243,7 @@ public void testProjectNameIsEscaped() throws Exception { final File prjDirF = new File(getWorkDir(), "EARProject"); EarProjectGenerator.createProject(prjDirF, "test project", - J2eeModule.JAVA_EE_5, serverID, "1.5", null, null); + Profile.JAVA_EE_5, serverID, "1.5", null, null); // test build.xml String buildXmlProjectName = ProjectManager.mutex().readAccess(new Mutex.ExceptionAction() { public String run() throws Exception { diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectTest.java @@ -60,6 +60,7 @@ import org.netbeans.modules.j2ee.dd.api.application.Application; import org.netbeans.modules.j2ee.dd.api.application.DDProvider; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.test.TestUtil; import org.netbeans.modules.j2ee.earproject.ui.wizards.NewEarProjectWizardIteratorTest; import org.netbeans.modules.project.uiapi.ProjectOpenedTrampoline; @@ -94,7 +95,7 @@ public void testEarWithoutDDOpeningJavaEE() throws Exception { File prjDirF = new File(getWorkDir(), "TestEarProject_15"); EarProjectGenerator.createProject(prjDirF, "test-project", - J2eeModule.JAVA_EE_5, serverID, "1.5", null, null); + Profile.JAVA_EE_5, serverID, "1.5", null, null); File dirCopy = copyFolder(prjDirF); File ddF = new File(dirCopy, "src/conf/application.xml"); assertFalse("has no deployment descriptor", ddF.isFile()); @@ -108,7 +109,7 @@ public void testEarWithoutDDOpeningJ2EE() throws Exception { // #75586 File prjDirF = new File(getWorkDir(), "TestEarProject_14"); EarProjectGenerator.createProject(prjDirF, "test-project", - J2eeModule.J2EE_14, serverID, "1.4", null, null); + Profile.J2EE_14, serverID, "1.4", null, null); File dirCopy = copyFolder(prjDirF); File ddF = new File(dirCopy, "src/conf/application.xml"); assertTrue("has deployment descriptor", ddF.isFile()); @@ -124,10 +125,10 @@ public void testThatMissingDDIsNotRegeneratedDuringOpeningJavaEE() throws Exception { File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.JAVA_EE_5; + Profile j2eeProfile = Profile.JAVA_EE_5; String ejbName = "testEA-ejb"; String acName = "testEA-ac"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID, null, ejbName, acName, null, null, null); File dirCopy = copyFolder(earDirF); File ddF = new File(dirCopy, "src/conf/application.xml"); @@ -147,10 +148,10 @@ public void testThatMissingDDIsRegeneratedCorrectlyDuringOpeningJ2EE() throws Exception { // #81154 File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.J2EE_14; + Profile j2eeProfile = Profile.J2EE_14; String ejbName = "testEA-ejb"; String acName = "testEA-ac"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID, null, ejbName, acName, null, null, null); File dirCopy = copyFolder(earDirF); File ddF = new File(dirCopy, "src/conf/application.xml"); @@ -171,10 +172,10 @@ public void testOpeningWihtoutPrivateMetadataAndSrcDirectory() throws Exception { // #83507 File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.JAVA_EE_5; + Profile j2eeProfile = Profile.JAVA_EE_5; String ejbName = "testEA-ejb"; String acName = "testEA-ac"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID, null, ejbName, acName, null, null, null); File dirCopy = copyFolder(earDirF); TestUtil.deleteRec(new File(new File(dirCopy, "nbproject"), "private")); @@ -191,10 +192,10 @@ public void testEarProjectIsGCed() throws Exception { // #83128 File prjDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = "1.4"; + Profile j2eeProfile = Profile.J2EE_14; // creates a project we will use for the import - NewEarProjectWizardIteratorTest.generateEARProject(prjDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(prjDirF, name, j2eeProfile, serverID, null, null, null, null, null, null); Project earProject = ProjectManager.getDefault().findProject(FileUtil.toFileObject(prjDirF)); EarProjectTest.openProject((EarProject) earProject); diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarProviderTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarProviderTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarProviderTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarProviderTest.java @@ -47,6 +47,7 @@ import org.netbeans.junit.NbTestCase; import org.netbeans.modules.j2ee.api.ejbjar.Ear; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.test.TestUtil; import org.netbeans.modules.j2ee.earproject.ui.wizards.NewEarProjectWizardIteratorTest; import org.openide.filesystems.FileObject; @@ -73,9 +74,9 @@ public void testFindEarJavaEE() throws Exception { File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.JAVA_EE_5; + Profile j2eeProfile = Profile.JAVA_EE_5; String ejbName = "testEA-ejb"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, serverID); + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID); FileObject earDirFO = FileUtil.toFileObject(earDirF); Project createdEjbJarProject = ProjectManager.getDefault().findProject(earDirFO); assertNotNull("Ear found", Ear.getEar(earDirFO)); @@ -88,9 +89,9 @@ public void testFindEarJ2EE() throws Exception { File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.J2EE_14; + Profile j2eeProfile = Profile.J2EE_14; String ejbName = "testEA-ejb"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, serverID); + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID); FileObject earDirFO = FileUtil.toFileObject(earDirF); Project createdEjbJarProject = ProjectManager.getDefault().findProject(earDirFO); assertNotNull("Ear found", Ear.getEar(earDirFO)); diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarTest.java @@ -47,6 +47,7 @@ import org.netbeans.modules.j2ee.api.ejbjar.Ear; import org.netbeans.modules.j2ee.dd.api.application.Application; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.test.TestUtil; import org.netbeans.modules.j2ee.earproject.ui.wizards.NewEarProjectWizardIteratorTest; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProject; @@ -75,16 +76,16 @@ // testing project File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.JAVA_EE_5; + Profile j2eeProfile = Profile.JAVA_EE_5; String ejbName = "testEA-ejb"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID, null, ejbName, null, null, null, null); FileObject earDirFO = FileUtil.toFileObject(earDirF); FileObject ejbProjectFO = earDirFO.getFileObject("testEA-ejb"); assertNotNull(ejbProjectFO); File earDirAnotherF = new File(getWorkDir(), "testEA-another"); - NewEarProjectWizardIteratorTest.generateEARProject(earDirAnotherF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(earDirAnotherF, name, j2eeProfile, serverID, null, null, null, null, null, null); FileObject earDirAnotherFO = FileUtil.toFileObject(earDirAnotherF); EjbJarProject createdEjbJarProject = (EjbJarProject) ProjectManager.getDefault().findProject(ejbProjectFO); diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/model/ApplicationImplTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/model/ApplicationImplTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/model/ApplicationImplTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/model/ApplicationImplTest.java @@ -53,6 +53,7 @@ import org.netbeans.modules.j2ee.dd.api.application.ApplicationMetadata; import org.netbeans.modules.j2ee.dd.api.application.Module; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.EarProject; import org.netbeans.modules.j2ee.earproject.classpath.ClassPathSupportCallbackImpl; import org.netbeans.modules.j2ee.earproject.test.TestUtil; @@ -98,8 +99,8 @@ // create project File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.JAVA_EE_5; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, + Profile j2eeProfile = Profile.JAVA_EE_5; + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID, WEB_NAME, EJB_NAME, CAR_NAME, null, null, null); FileObject prjDirFO = FileUtil.toFileObject(earDirF); diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNodeTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNodeTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNodeTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNodeTest.java @@ -45,6 +45,7 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; import org.netbeans.junit.NbTestCase; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.test.TestUtil; import org.netbeans.modules.j2ee.earproject.ui.wizards.NewEarProjectWizardIteratorTest; import org.netbeans.spi.project.ui.LogicalViewProvider; @@ -77,11 +78,11 @@ public void testRemoveFromJarContent() throws Exception { File prjDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = "1.4"; + Profile j2eeProfile = Profile.J2EE_14; String jarName = "testEA-ejb"; // creates a project we will use for the import - NewEarProjectWizardIteratorTest.generateEARProject(prjDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(prjDirF, name, j2eeProfile, serverInstanceID, null, null, jarName, null, null, null); Project earProject = ProjectManager.getDefault().findProject(FileUtil.toFileObject(prjDirF)); @@ -102,11 +103,11 @@ public void testRemoveFromJarContentWithDeletedProject() throws Exception { File prjDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = "1.4"; + Profile j2eeProfile = Profile.J2EE_14; String jarName = "testEA-ejb"; // creates a project we will use for the import - NewEarProjectWizardIteratorTest.generateEARProject(prjDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(prjDirF, name, j2eeProfile, serverInstanceID, null, null, jarName, null, null, null); FileObject prjDirFO = FileUtil.toFileObject(prjDirF); diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectPropertiesTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectPropertiesTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectPropertiesTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectPropertiesTest.java @@ -57,6 +57,7 @@ import org.netbeans.modules.java.api.common.classpath.ClassPathSupport; import org.netbeans.modules.j2ee.dd.api.application.Application; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.EarProject; import org.netbeans.modules.j2ee.earproject.EarProjectGenerator; import org.netbeans.modules.j2ee.earproject.EarProjectTest; @@ -99,10 +100,10 @@ // create project File earDirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = J2eeModule.JAVA_EE_5; + Profile j2eeProfile = Profile.JAVA_EE_5; String ejbName = "testEA-ejb"; String carName = "testEA-app-client"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID, null, ejbName, carName, null, null, null); FileObject prjDirFO = FileUtil.toFileObject(earDirF); EarProject project = (EarProject) ProjectManager.getDefault().findProject(prjDirFO); @@ -132,7 +133,7 @@ public void testPropertiesWithoutDDJ2EE() throws Exception { // see #73751 File proj = new File(getWorkDir(), "EARProject"); AntProjectHelper aph = EarProjectGenerator.createProject(proj, - "test-project", J2eeModule.J2EE_14, serverID, "1.4", null, null); + "test-project", Profile.J2EE_14, serverID, "1.4", null, null); FileObject prjDirFO = aph.getProjectDirectory(); // simulateing #73751 prjDirFO.getFileObject("src/conf/application.xml").delete(); @@ -145,7 +146,7 @@ public void testPropertiesWithoutDDJavaEE() throws Exception { File proj = new File(getWorkDir(), "EARProject"); AntProjectHelper aph = EarProjectGenerator.createProject(proj, - "test-project", J2eeModule.JAVA_EE_5, serverID, "1.5", null, null); + "test-project", Profile.JAVA_EE_5, serverID, "1.5", null, null); FileObject prjDirFO = aph.getProjectDirectory(); assertNull("application should not exist", prjDirFO.getFileObject("src/conf/application.xml")); EarProject p = (EarProject)ProjectManager.getDefault().findProject(prjDirFO); @@ -155,18 +156,18 @@ } public void testPathInEARChangingJ2EE() throws Exception { // see #76008 - testPathInEARChanging(J2eeModule.J2EE_14); + testPathInEARChanging(Profile.J2EE_14); } public void testPathInEARChangingJavaEE() throws Exception { // see #76008 - testPathInEARChanging(J2eeModule.JAVA_EE_5); + testPathInEARChanging(Profile.JAVA_EE_5); } - private void testPathInEARChanging(String j2eeLevel) throws Exception { // see #76008 + private void testPathInEARChanging(Profile j2eeProfile) throws Exception { // see #76008 File earDirF = new File(getWorkDir(), "testEA-1"); String name = "Test EnterpriseApplication"; String ejbName = "testEA-ejb"; - NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeLevel, + NewEarProjectWizardIteratorTest.generateEARProject(earDirF, name, j2eeProfile, serverID, null, ejbName, null, null, null, null); EarProject earProject = (EarProject) ProjectManager.getDefault().findProject(FileUtil.toFileObject(earDirF)); Application app = earProject.getAppModule().getApplication(); @@ -281,7 +282,7 @@ createData.setName(warName); createData.setServerInstanceID(this.serverID); createData.setSourceStructure(WebProjectUtilities.SRC_STRUCT_BLUEPRINTS); - createData.setJavaEEVersion(EarProjectGenerator.checkJ2eeVersion(J2eeModule.JAVA_EE_5, serverID, J2eeModule.WAR)); + createData.setJavaEEProfile(EarProjectGenerator.getAcceptableProfile(Profile.JAVA_EE_5, serverID, J2eeModule.WAR)); createData.setContextPath("/" + warName); AntProjectHelper webHelper = WebProjectUtilities.createProject(createData); diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIteratorTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIteratorTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIteratorTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIteratorTest.java @@ -61,6 +61,7 @@ import org.netbeans.modules.j2ee.dd.api.application.Module; import org.netbeans.modules.j2ee.dd.api.application.Web; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.EarProject; import org.netbeans.modules.j2ee.earproject.EarProjectTest; import org.netbeans.modules.j2ee.earproject.ModuleType; @@ -85,7 +86,7 @@ private static final String CUSTOM_CONTEXT_ROOT = "/my-context-root"; private String name; - private String j2eeLevel; + private Profile j2eeProfile; private String warName; private String jarName; private String carName; @@ -103,7 +104,7 @@ private void setDefaultValues() { name = "Test EnterpriseApplication"; - j2eeLevel = J2eeModule.JAVA_EE_5; + j2eeProfile = Profile.JAVA_EE_5; warName = "testEA-war"; jarName = "testEA-ejb"; carName = "testEA-app-client"; @@ -127,11 +128,11 @@ } public void testTestableInstantiateBasics() throws Exception { - j2eeLevel = J2eeModule.JAVA_EE_5; + j2eeProfile = Profile.JAVA_EE_5; generateJ2EEApplication(false); File importedDir = new File(getWorkDir(), "testEA-imported"); ImportBlueprintEarWizardIterator.testableInstantiate(platformName, sourceLevel, - j2eeLevel, importedDir, prjDirF, serverInstanceID, name, + j2eeProfile, importedDir, prjDirF, serverInstanceID, name, Collections.emptyMap(), null, null, null); FileObject fo = FileUtil.toFileObject(importedDir); @@ -141,7 +142,7 @@ } public void testTestableInstantiateWitoutDD() throws Exception { - j2eeLevel = J2eeModule.J2EE_14; + j2eeProfile = Profile.J2EE_14; FileObject prjDirFO = generateJ2EEApplication(true); // and Enterprise Application's deployment descriptor @@ -153,7 +154,7 @@ userModules.put(prjDirFO.getFileObject(carName), ModuleType.CLIENT); File importedDir = new File(getWorkDir(), "testEA-imported"); ImportBlueprintEarWizardIterator.testableInstantiate(platformName, sourceLevel, - j2eeLevel, importedDir, prjDirF, serverInstanceID, name, userModules, null, null, null); + j2eeProfile, importedDir, prjDirF, serverInstanceID, name, userModules, null, null, null); FileObject importedDirFO = FileUtil.toFileObject(importedDir); FileObject ddFO = prjDirFO.getFileObject("src/conf/application.xml"); @@ -166,12 +167,12 @@ } public void testTestableInstantiateWithWebAndEJBAndAC() throws Exception { - j2eeLevel = J2eeModule.J2EE_14; + j2eeProfile = Profile.J2EE_14; FileObject prjDirFO = generateJ2EEApplication(true); File importedDir = new File(getWorkDir(), "testEA-imported"); ImportBlueprintEarWizardIterator.testableInstantiate(platformName, sourceLevel, - j2eeLevel, importedDir, prjDirF, serverInstanceID, name, + j2eeProfile, importedDir, prjDirF, serverInstanceID, name, Collections.emptyMap(), null, null, null); assertNotNull("have a backup copy of application.xml", prjDirFO.getFileObject("src/conf/original_application.xml")); @@ -191,12 +192,12 @@ // temporarily(?) turned off public void off_testWebContextRootIsSet() throws Exception { - this.j2eeLevel = "1.4"; + this.j2eeProfile = Profile.J2EE_14; generateJ2EEApplicationWithWeb(); File importedDir = new File(getWorkDir(), "testEA-imported"); ImportBlueprintEarWizardIterator.testableInstantiate(platformName, sourceLevel, - j2eeLevel, importedDir, prjDirF, serverInstanceID, name, + j2eeProfile, importedDir, prjDirF, serverInstanceID, name, Collections.emptyMap(), null, null, null); String importedContextRoot = null; @@ -220,7 +221,7 @@ private FileObject generateJ2EEApplication() throws Exception { // creates a project we will use for the import NewEarProjectWizardIteratorTest.generateEARProject( - prjDirF, name, j2eeLevel, serverInstanceID, + prjDirF, name, j2eeProfile, serverInstanceID, warName, jarName, carName, mainClass, platformName, sourceLevel); // Workaround. Set the context root which should be set automatically. diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIteratorTest.java b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIteratorTest.java --- a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIteratorTest.java +++ b/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIteratorTest.java @@ -52,6 +52,7 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; import org.netbeans.junit.NbTestCase; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.earproject.EarProject; import org.netbeans.modules.j2ee.earproject.EarProjectTest; import org.netbeans.modules.j2ee.earproject.TestPlatformProvider; @@ -78,12 +79,12 @@ * May be used for generating project instances in tests. */ public static void generateEARProject( - File prjDirF, String name, String j2eeLevel, + File prjDirF, String name, Profile j2eeProfile, String serverInstanceID, String warName, String jarName, String carName, String mainClass, String platformName, String sourceLevel) throws IOException { NewEarProjectWizardIterator.testableInstantiate(prjDirF, name, - j2eeLevel, serverInstanceID, warName, jarName, + j2eeProfile, serverInstanceID, warName, jarName, carName, mainClass, platformName, sourceLevel, null, null, null); } @@ -94,8 +95,8 @@ * @see #generateEARProject(File, String, String, String, String, String, String, String, String, String) */ public static void generateEARProject(File earDirF, String name, - String j2eeLevel, String serverID) throws IOException { - generateEARProject(earDirF, name, j2eeLevel, serverID, null, null, null, + Profile j2eeProfile, String serverID) throws IOException { + generateEARProject(earDirF, name, j2eeProfile, serverID, null, null, null, null, null, null); } @@ -122,7 +123,7 @@ public void testTestableInstantiate() throws Exception { File dirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = "1.4"; + Profile j2eeProfile = Profile.J2EE_14; String warName = null; String jarName = null; String carName = null; @@ -131,7 +132,7 @@ String sourceLevel = null; Set result = NewEarProjectWizardIterator.testableInstantiate(dirF, name, - j2eeLevel, serverInstanceID, warName, jarName, + j2eeProfile, serverInstanceID, warName, jarName, carName, mainClass, platformName, sourceLevel, null, null, null); Set expResult = new HashSet(); @@ -150,7 +151,7 @@ assertNotNull("application client registered", FileUtil.getConfigFile(resource)); File dirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = "1.4"; + Profile j2eeProfile = Profile.J2EE_14; String warName = null; String jarName = null; String carName = "testEA-app-client"; @@ -159,7 +160,7 @@ String sourceLevel = null; Set result = NewEarProjectWizardIterator.testableInstantiate(dirF, name, - j2eeLevel, serverInstanceID, warName, jarName, + j2eeProfile, serverInstanceID, warName, jarName, carName, mainClass, platformName, sourceLevel, null, null, null); Set expResult = new HashSet(); @@ -182,7 +183,7 @@ assertNotNull("application client registered", FileUtil.getConfigFile(resource)); File dirF = new File(getWorkDir(), "testEA"); String name = "Test EnterpriseApplication"; - String j2eeLevel = "1.4"; + Profile j2eeProfile = Profile.J2EE_14; String warName = "testEA-war"; String jarName = "testEA-ejb"; String carName = "testEA-app-client"; @@ -191,7 +192,7 @@ String sourceLevel = null; Set result = NewEarProjectWizardIterator.testableInstantiate(dirF, name, - j2eeLevel, serverInstanceID, warName, jarName, + j2eeProfile, serverInstanceID, warName, jarName, carName, mainClass, platformName, sourceLevel, null, null, null); Set expResult = new HashSet(); diff --git a/j2ee.ejbjarproject/manifest.mf b/j2ee.ejbjarproject/manifest.mf --- a/j2ee.ejbjarproject/manifest.mf +++ b/j2ee.ejbjarproject/manifest.mf @@ -2,6 +2,6 @@ OpenIDE-Module: org.netbeans.modules.j2ee.ejbjarproject OpenIDE-Module-Layer: org/netbeans/modules/j2ee/ejbjarproject/ui/resources/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/ejbjarproject/Bundle.properties -OpenIDE-Module-Specification-Version: 1.15 +OpenIDE-Module-Specification-Version: 1.16 AutoUpdate-Show-In-Client: false diff --git a/j2ee.ejbjarproject/nbproject/project.xml b/j2ee.ejbjarproject/nbproject/project.xml --- a/j2ee.ejbjarproject/nbproject/project.xml +++ b/j2ee.ejbjarproject/nbproject/project.xml @@ -155,7 +155,7 @@ 1 - 1.36 + 1.38 @@ -214,7 +214,7 @@ 4 - 1.53 + 1.58 diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarPersistenceProvider.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarPersistenceProvider.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarPersistenceProvider.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarPersistenceProvider.java @@ -52,6 +52,7 @@ import org.netbeans.api.java.classpath.ClassPath; import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Capabilities; import org.netbeans.modules.java.api.common.classpath.ClassPathProviderImpl; import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; @@ -222,18 +223,7 @@ } public boolean supportsDefaultProvider() { - J2eeModuleProvider j2eeModuleProvider = project.getLookup().lookup(J2eeModuleProvider.class); - J2eePlatform platform = Deployment.getDefault().getJ2eePlatform(j2eeModuleProvider.getServerInstanceID()); - - if (platform == null){ - // server probably not registered, can't resolve whether default provider is supported (see #79856) - return false; - } - - Set supportedVersions = platform.getSupportedSpecVersions(j2eeModuleProvider.getJ2eeModule().getModuleType()); - - return supportedVersions.contains(J2eeModule.JAVA_EE_5) - && platform.isToolSupported("defaultPersistenceProviderJavaEE5"); // NOI18N + return Capabilities.forProject(project).hasDefaultPersistenceProvider(); } /** diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProvider.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProvider.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProvider.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProvider.java @@ -57,6 +57,7 @@ import org.netbeans.api.project.SourceGroup; import org.netbeans.api.project.Sources; import org.netbeans.api.project.ui.OpenProjects; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.java.api.common.classpath.ClassPathProviderImpl; import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties; import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider; @@ -84,6 +85,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.api.ModuleChangeReporter; +import org.netbeans.modules.j2ee.ejbjarproject.ui.customizer.EjbJarCompositePanelProvider; import org.netbeans.modules.java.api.common.project.ProjectProperties; import org.netbeans.modules.websvc.spi.webservices.WebServicesConstants; @@ -121,7 +123,7 @@ if (metaInfFo != null) { ddFO = metaInfFo.getFileObject(FILE_DD); } - if (ddFO == null && !J2EEProjectProperties.JAVA_EE_5.equals(getJ2eePlatformVersion())) { + if (ddFO == null && !EjbProjectConstants.JAVA_EE_5_LEVEL.equals(getJ2eePlatformVersion())) { // ...generate the DD from template... } return ddFO; @@ -160,8 +162,8 @@ /** Package-private for unit test only. */ static boolean needConfigurationFolder(final String version) { - return J2EEProjectProperties.J2EE_1_3.equals(version) || - J2EEProjectProperties.J2EE_1_4.equals(version); + return EjbProjectConstants.J2EE_13_LEVEL.equals(version) || + EjbProjectConstants.J2EE_14_LEVEL.equals(version); } public File getMetaInfAsFile() { diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectCreateData.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectCreateData.java new file mode 100644 --- /dev/null +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectCreateData.java @@ -0,0 +1,154 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.j2ee.ejbjarproject.api; + +import java.io.File; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; + +/** + * + * @author Petr Hejl + */ +public final class EjbJarProjectCreateData { + + private File projectDir; + + private String name; + + private Profile javaEEProfile; + + private String serverInstanceID; + + private String librariesDefinition; + + private String serverLibraryName; + + private File[] sourceFolders; + + private File[] testFolders; + + private File configFilesBase; + + private File libFolder; + + public EjbJarProjectCreateData() { + } + + public Profile getJavaEEProfile() { + return javaEEProfile; + } + + public void setJavaEEProfile(Profile javaEEProfile) { + this.javaEEProfile = javaEEProfile; + } + + public String getLibrariesDefinition() { + return librariesDefinition; + } + + public void setLibrariesDefinition(String librariesDefinition) { + this.librariesDefinition = librariesDefinition; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public File getProjectDir() { + return projectDir; + } + + public void setProjectDir(File projectDir) { + this.projectDir = projectDir; + } + + public String getServerInstanceID() { + return serverInstanceID; + } + + public void setServerInstanceID(String serverInstanceID) { + this.serverInstanceID = serverInstanceID; + } + + public String getServerLibraryName() { + return serverLibraryName; + } + + public void setServerLibraryName(String serverLibraryName) { + this.serverLibraryName = serverLibraryName; + } + + public File getConfigFilesBase() { + return configFilesBase; + } + + public void setConfigFilesBase(File configFilesBase) { + this.configFilesBase = configFilesBase; + } + + public File getLibFolder() { + return libFolder; + } + + public void setLibFolder(File libFolder) { + this.libFolder = libFolder; + } + + public File[] getSourceFolders() { + return sourceFolders; + } + + public void setSourceFolders(File[] sourceFolders) { + this.sourceFolders = sourceFolders; + } + + public File[] getTestFolders() { + return testFolders; + } + + public void setTestFolders(File[] testFolders) { + this.testFolders = testFolders; + } + +} diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectGenerator.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectGenerator.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectGenerator.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/api/EjbJarProjectGenerator.java @@ -61,7 +61,6 @@ import org.netbeans.api.project.libraries.LibraryManager; import org.netbeans.api.queries.FileEncodingQuery; import org.netbeans.modules.j2ee.common.SharabilityUtility; -import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.support.ant.EditableProperties; import org.netbeans.spi.project.support.ant.ProjectGenerator; @@ -70,6 +69,7 @@ import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProject; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProjectType; import org.netbeans.modules.j2ee.ejbjarproject.Utils; @@ -116,33 +116,51 @@ * @param serverInstanceID server instance ID * @return the helper object permitting it to be further customized * @throws IOException in case something went wrong + * @deprecated */ public static AntProjectHelper createProject(File dir, final String name, final String j2eeLevel, final String serverInstanceID) throws IOException { return createProject(dir, name, j2eeLevel, serverInstanceID, null, null); } - + + @Deprecated public static AntProjectHelper createProject(File dir, final String name, final String j2eeLevel, final String serverInstanceID, final String librariesDefinition, final String serverLibraryName) throws IOException { + + EjbJarProjectCreateData createData = new EjbJarProjectCreateData(); + createData.setProjectDir(dir); + createData.setName(name); + createData.setJavaEEProfile(Profile.fromPropertiesString(j2eeLevel)); + createData.setServerInstanceID(serverInstanceID); + createData.setLibrariesDefinition(librariesDefinition); + createData.setServerLibraryName(serverLibraryName); + return createProject(createData); + } + + public static AntProjectHelper createProject(final EjbJarProjectCreateData createData) throws IOException { + File dir = createData.getProjectDir(); + final FileObject projectDir = FileUtil.createFolder(dir); final AntProjectHelper[] h = new AntProjectHelper[1]; - + // create project in one FS atomic action: FileSystem fs = projectDir.getFileSystem(); fs.runAtomicAction(new FileSystem.AtomicAction() { public void run() throws IOException { - AntProjectHelper helper = createProjectImpl(projectDir, name, - j2eeLevel, serverInstanceID, librariesDefinition, serverLibraryName); + AntProjectHelper helper = createProjectImpl(createData, projectDir); h[0] = helper; }}); return h[0]; } - private static AntProjectHelper createProjectImpl(FileObject projectDir, String name, - String j2eeLevel, final String serverInstanceID, final String librariesDefinition, final String serverLibraryName) throws IOException { - + private static AntProjectHelper createProjectImpl(final EjbJarProjectCreateData createData, + final FileObject projectDir) throws IOException { + + String name = createData.getName(); + String serverInstanceID = createData.getServerInstanceID(); + FileObject srcRoot = projectDir.createFolder(DEFAULT_SRC_FOLDER); // NOI18N srcRoot.createFolder(DEFAULT_JAVA_FOLDER); //NOI18N projectDir.createFolder(DEFAULT_TEST_FOLDER); @@ -151,12 +169,12 @@ //create a default manifest FileUtil.copyFile(FileUtil.getConfigFile("org-netbeans-modules-j2ee-ejbjarproject/MANIFEST.MF"), confRoot, "MANIFEST"); //NOI18N - final String realServerLibraryName = configureServerLibrary(librariesDefinition, - serverInstanceID, projectDir, serverLibraryName != null); + final String realServerLibraryName = configureServerLibrary(createData.getLibrariesDefinition(), + serverInstanceID, projectDir, createData.getServerLibraryName() != null); final AntProjectHelper h = setupProject(projectDir, name, - "src", "test", null, null, null, j2eeLevel, serverInstanceID, - librariesDefinition, realServerLibraryName); + "src", "test", null, null, null, createData.getJavaEEProfile(), serverInstanceID, + createData.getLibrariesDefinition(), realServerLibraryName); EditableProperties ep = h.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); ep.put(EjbJarProjectProperties.SOURCE_ROOT, DEFAULT_SRC_FOLDER); //NOI18N @@ -174,7 +192,7 @@ try { ProjectManager.mutex().writeAccess(new Mutex.ExceptionAction() { public Void run() throws Exception { - copyRequiredLibraries(h, refHelper, serverInstanceID, serverLibraryName); + copyRequiredLibraries(h, refHelper, createData); return null; } }); @@ -183,7 +201,7 @@ } // create ejb-jar.xml - if (!J2eeModule.JAVA_EE_5.equals(j2eeLevel)) { + if (!Profile.JAVA_EE_5.equals(createData.getJavaEEProfile())) { String resource = "org-netbeans-modules-j2ee-ejbjarproject/ejb-jar-2.1.xml"; FileObject ddFile = FileUtil.copyFile(FileUtil.getConfigFile(resource), confRoot, "ejb-jar"); //NOI18N EjbJar ejbJar = DDProvider.getDefault().getDDRoot(ddFile); @@ -235,7 +253,8 @@ ProjectManager.getDefault().saveProject(subP); return retVal; } - + + @Deprecated public static AntProjectHelper importProject(final File dir, final String name, final File[] sourceFolders, final File[] testFolders, final File configFilesBase, final File libFolder, final String j2eeLevel, @@ -244,46 +263,68 @@ return importProject(dir, name, sourceFolders, testFolders, configFilesBase, libFolder, j2eeLevel, serverInstanceID, null, null); } - + + @Deprecated public static AntProjectHelper importProject(final File dir, final String name, final File[] sourceFolders, final File[] testFolders, final File configFilesBase, final File libFolder, final String j2eeLevel, final String serverInstanceID, final String librariesDefinition, final String serverLibraryName) throws IOException { + + EjbJarProjectCreateData createData = new EjbJarProjectCreateData(); + createData.setProjectDir(dir); + createData.setName(name); + createData.setSourceFolders(sourceFolders); + createData.setTestFolders(testFolders); + createData.setConfigFilesBase(configFilesBase); + createData.setLibFolder(libFolder); + createData.setJavaEEProfile(Profile.fromPropertiesString(j2eeLevel)); + createData.setServerInstanceID(serverInstanceID); + createData.setLibrariesDefinition(librariesDefinition); + createData.setServerLibraryName(serverLibraryName); + return importProject(createData); + } + + public static AntProjectHelper importProject(final EjbJarProjectCreateData createData) throws IOException { + File dir = createData.getProjectDir(); + assert dir != null: "Project folder can't be null"; //NOI18N final FileObject projectDir = FileUtil.createFolder(dir); final AntProjectHelper[] h = new AntProjectHelper[1]; - + // create project in one FS atomic action: FileSystem fs = projectDir.getFileSystem(); fs.runAtomicAction(new FileSystem.AtomicAction() { public void run() throws IOException { - AntProjectHelper helper = importProjectImpl(projectDir, name, sourceFolders, testFolders, - configFilesBase, libFolder, j2eeLevel, serverInstanceID, librariesDefinition, serverLibraryName); + AntProjectHelper helper = importProjectImpl(createData, projectDir); h[0] = helper; }}); return h[0]; - } + } - private static AntProjectHelper importProjectImpl(final FileObject projectDir, final String name, - final File[] sourceFolders, final File[] testFolders, - final File configFilesBase, final File libFolder, final String j2eeLevel, - final String serverInstanceID, String librariesDefinition, final String serverLibraryName) throws IOException { - + private static AntProjectHelper importProjectImpl(final EjbJarProjectCreateData createData, + final FileObject projectDir) throws IOException { + + String name = createData.getName(); + final File[] sourceFolders = createData.getSourceFolders(); + final File[] testFolders = createData.getTestFolders(); + Profile j2eeProfile = createData.getJavaEEProfile(); + String serverInstanceID = createData.getServerInstanceID(); + assert sourceFolders != null && testFolders != null: "Package roots can't be null"; //NOI18N // this constructor creates only java application type - final String realServerLibraryName = configureServerLibrary(librariesDefinition, - serverInstanceID, projectDir, serverLibraryName != null); + final String realServerLibraryName = configureServerLibrary(createData.getLibrariesDefinition(), + serverInstanceID, projectDir, createData.getServerLibraryName() != null); final AntProjectHelper h = setupProject(projectDir, name, null, null, - configFilesBase, - (libFolder == null ? null : libFolder), + createData.getConfigFilesBase(), + createData.getLibFolder(), null, - j2eeLevel, + j2eeProfile, serverInstanceID, - librariesDefinition, + createData.getLibrariesDefinition(), realServerLibraryName); final EjbJarProject p = (EjbJarProject) ProjectManager.getDefault().findProject(projectDir); @@ -330,7 +371,7 @@ } } h.putPrimaryConfigurationData(data,true); - copyRequiredLibraries(h, refHelper, serverInstanceID, serverLibraryName); + copyRequiredLibraries(h, refHelper, createData); ProjectManager.getDefault().saveProject(p); return null; } @@ -342,12 +383,12 @@ } // AB: fix for #53170: if j2eeLevel is 1.4 and ejb-jar.xml is version 2.0, we upgrade it to version 2.1 - FileObject ejbJarXml = FileUtil.toFileObject(configFilesBase).getFileObject("ejb-jar.xml"); // NOI18N + FileObject ejbJarXml = FileUtil.toFileObject(createData.getConfigFilesBase()).getFileObject("ejb-jar.xml"); // NOI18N if (ejbJarXml != null) { try { EjbJar root = DDProvider.getDefault().getDDRoot(ejbJarXml); boolean writeDD = false; - if (new BigDecimal(EjbJar.VERSION_2_0).equals(root.getVersion()) && j2eeLevel.equals(J2EEProjectProperties.J2EE_1_4)) { // NOI18N + if (new BigDecimal(EjbJar.VERSION_2_0).equals(root.getVersion()) && Profile.J2EE_14.equals(j2eeProfile)) { // NOI18N root.setVersion(new BigDecimal(EjbJar.VERSION_2_1)); writeDD = true; } @@ -367,8 +408,7 @@ return h; } - private static void copyRequiredLibraries(AntProjectHelper h, ReferenceHelper rh, - String serverInstanceId, String serverlibraryName) throws IOException { + private static void copyRequiredLibraries(AntProjectHelper h, ReferenceHelper rh, EjbJarProjectCreateData data) throws IOException { if (!h.isSharableProject()) { return; @@ -422,7 +462,7 @@ private static AntProjectHelper setupProject(FileObject dirFO, String name, String srcRoot, String testRoot, File configFiles, File libraries, String resources, - String j2eeLevel, String serverInstanceID, String librariesDefinition, String serverLibraryName) throws IOException { + Profile j2eeProfile, String serverInstanceID, String librariesDefinition, String serverLibraryName) throws IOException { Utils.logUI(NbBundle.getBundle(EjbJarProjectGenerator.class), "UI_EJB_PROJECT_CREATE_SHARABILITY", // NOI18N new Object[]{Boolean.valueOf(librariesDefinition != null), Boolean.valueOf(serverLibraryName != null)}); @@ -484,7 +524,7 @@ ep.setProperty(EjbJarProjectProperties.DIST_JAR, "${"+EjbJarProjectProperties.DIST_DIR+"}/" + "${" + EjbJarProjectProperties.JAR_NAME + "}"); //XXX the name of the dist.ear.jar file should be different, but now it cannot be since the name is used as a key in module provider mapping ep.setProperty(EjbJarProjectProperties.DIST_EAR_JAR, "${"+EjbJarProjectProperties.DIST_DIR+"}/" + "${" + EjbJarProjectProperties.JAR_NAME + "}"); - ep.setProperty(EjbJarProjectProperties.J2EE_PLATFORM, j2eeLevel); + ep.setProperty(EjbJarProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); ep.setProperty(EjbJarProjectProperties.JAR_NAME, PropertyUtils.getUsablePropertyName(name) + ".jar"); ep.setProperty(EjbJarProjectProperties.JAR_COMPRESS, "false"); // ep.setProperty(EjbJarProjectProperties.JAR_CONTENT_ADDITIONAL, ""); @@ -581,9 +621,9 @@ // set j2ee.platform.classpath J2eePlatform j2eePlatform = Deployment.getDefault().getJ2eePlatform(serverInstanceID); - if (!j2eePlatform.getSupportedSpecVersions(J2eeModule.EJB).contains(j2eeLevel)) { + if (!j2eePlatform.getSupportedProfiles(J2eeModule.EJB).contains(j2eeProfile)) { Logger.getLogger("global").log(Level.WARNING, - "J2EE level:" + j2eeLevel + " not supported by server " + Deployment.getDefault().getServerInstanceDisplayName(serverInstanceID) + " for module type EJB"); // NOI18N + "J2EE level:" + j2eeProfile + " not supported by server " + Deployment.getDefault().getServerInstanceDisplayName(serverInstanceID) + " for module type EJB"); // NOI18N } if (!h.isSharableProject() || serverLibraryName == null) { diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbJarLogicalViewProvider.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbJarLogicalViewProvider.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbJarLogicalViewProvider.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbJarLogicalViewProvider.java @@ -92,6 +92,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProject; import org.netbeans.modules.j2ee.spi.ejbjar.support.J2eeProjectView; @@ -477,15 +478,15 @@ } public void actionPerformed(ActionEvent e) { - String j2eeSpec = project.evaluator().getProperty(EjbJarProjectProperties.J2EE_PLATFORM); - if (j2eeSpec == null) { - j2eeSpec = J2EEProjectProperties.JAVA_EE_5; // NOI18N + Profile j2eeProfile = Profile.fromPropertiesString(project.evaluator().getProperty(EjbJarProjectProperties.J2EE_PLATFORM)); + if (j2eeProfile == null) { + j2eeProfile = Profile.JAVA_EE_5; Logger.getLogger(EjbJarLogicalViewProvider.class.getName()).warning( "project ["+project.getProjectDirectory()+"] is missing "+EjbJarProjectProperties.J2EE_PLATFORM+". " + // NOI18N - "default value will be used instead: "+j2eeSpec); // NOI18N - updateJ2EESpec(project, project.getAntProjectHelper(), j2eeSpec); + "default value will be used instead: "+j2eeProfile); // NOI18N + updateJ2EESpec(project, project.getAntProjectHelper(), j2eeProfile); } - String instance = BrokenServerSupport.selectServer(j2eeSpec, J2eeModule.EJB); + String instance = BrokenServerSupport.selectServer(j2eeProfile, J2eeModule.EJB); if (instance != null) { EjbJarProjectProperties.setServerInstance( project, helper, instance); @@ -493,12 +494,12 @@ checkMissingServer(); } - private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final String j2eeSpec) { + private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final Profile j2eeProfile) { ProjectManager.mutex().postWriteRequest(new Runnable() { public void run() { try { EditableProperties projectProps = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); - projectProps.put(EjbJarProjectProperties.J2EE_PLATFORM, j2eeSpec); + projectProps.put(EjbJarProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); helper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, projectProps); ProjectManager.getDefault().saveProject(project); } catch (IOException e) { diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarCompositePanelProvider.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarCompositePanelProvider.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarCompositePanelProvider.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarCompositePanelProvider.java @@ -45,6 +45,7 @@ import java.util.ResourceBundle; import javax.swing.JComponent; import javax.swing.JPanel; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProject; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProvider; @@ -193,7 +194,7 @@ private static boolean showWebServicesCategory(EjbJarProjectProperties uiProperties) { EjbJarProject project = (EjbJarProject) uiProperties.getProject(); - if(J2EEProjectProperties.J2EE_1_4.equals(project.getEjbModule().getJ2eePlatformVersion())) { + if(EjbProjectConstants.J2EE_14_LEVEL.equals(project.getEjbModule().getJ2eePlatformVersion())) { return WebServicesSupport.getWebServicesSupport(project.getProjectDirectory())!=null; } return false; diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarProjectProperties.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarProjectProperties.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarProjectProperties.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarProjectProperties.java @@ -91,6 +91,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProject; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProjectType; import org.netbeans.modules.j2ee.ejbjarproject.Utils; @@ -313,8 +314,8 @@ PLATFORM_MODEL = PlatformUiSupport.createPlatformComboBoxModel (evaluator.getProperty(JAVA_PLATFORM)); PLATFORM_LIST_RENDERER = PlatformUiSupport.createPlatformListCellRenderer(); SpecificationVersion minimalSourceLevel = null; - if (J2EEProjectProperties.JAVA_EE_5.equals(evaluator.getProperty(J2EE_PLATFORM))) { - minimalSourceLevel = new SpecificationVersion(J2EEProjectProperties.JAVA_EE_5); + if (Profile.JAVA_EE_5.equals(Profile.fromPropertiesString(evaluator.getProperty(J2EE_PLATFORM)))) { + minimalSourceLevel = new SpecificationVersion("1.5"); } JAVAC_SOURCE_MODEL = PlatformUiSupport.createSourceLevelComboBoxModel (PLATFORM_MODEL, evaluator.getProperty(JAVAC_SOURCE), evaluator.getProperty(JAVAC_TARGET), minimalSourceLevel); JAVAC_SOURCE_RENDERER = PlatformUiSupport.createSourceLevelListCellRenderer (); @@ -474,10 +475,10 @@ } // Update the deployment descriptor if upgrading from J2EE 1.3 to 1.4 and set the new J2EE spec version - String oldJ2eeVersion = projectProperties.getProperty(J2EE_PLATFORM); - String newJ2eeVersion = J2eePlatformUiSupport.getSpecVersion(J2EE_PLATFORM_MODEL.getSelectedItem()); + Profile oldJ2eeVersion = Profile.fromPropertiesString(projectProperties.getProperty(J2EE_PLATFORM)); + Profile newJ2eeVersion = J2eePlatformUiSupport.getJavaEEProfile(J2EE_PLATFORM_MODEL.getSelectedItem()); if (oldJ2eeVersion != null && newJ2eeVersion != null) { - if (oldJ2eeVersion.equals(J2EEProjectProperties.J2EE_1_3) && newJ2eeVersion.equals(J2EEProjectProperties.J2EE_1_4)) { + if (oldJ2eeVersion.equals(Profile.J2EE_13) && newJ2eeVersion.equals(Profile.J2EE_14)) { org.netbeans.modules.j2ee.api.ejbjar.EjbJar ejbJarModules[] = org.netbeans.modules.j2ee.api.ejbjar.EjbJar.getEjbJars(project); if (ejbJarModules.length > 0) { FileObject ddFo = ejbJarModules[0].getDeploymentDescriptor(); @@ -492,7 +493,7 @@ } // Set the new J2EE spec version - projectProperties.setProperty(J2EE_PLATFORM, newJ2eeVersion); + projectProperties.setProperty(J2EE_PLATFORM, newJ2eeVersion.toPropertiesString()); } projectProperties.putAll(additionalProperties); diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/Bundle.properties b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/Bundle.properties --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/Bundle.properties +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/Bundle.properties @@ -85,10 +85,6 @@ LBL_NWP1_AddToEApp_CheckBox=Add to Enterprise &Application\: -J2EESpecLevel_15=Java EE 5 -J2EESpecLevel_14=J2EE 1.4 -J2EESpecLevel_13=J2EE 1.3 - J2EESpecLevel_Desc_14=J2EE 1.4 includes EJB specification 2.1.\n\nThis specification level is supported by servers like Sun Java System Application Server Platform Edition 8 LBL_NWP1_SetAsMain_CheckBoxMnemonic=M diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/ImportEjbJarProjectWizardIterator.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/ImportEjbJarProjectWizardIterator.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/ImportEjbJarProjectWizardIterator.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/ImportEjbJarProjectWizardIterator.java @@ -65,11 +65,13 @@ import org.netbeans.modules.j2ee.common.project.ui.ProjectLocationWizardPanel; import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProject; import org.openide.util.NbBundle; import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectGenerator; import org.netbeans.modules.j2ee.ejbjarproject.Utils; +import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectCreateData; import org.netbeans.spi.project.support.ant.AntProjectHelper; @@ -127,15 +129,25 @@ File configFilesFolder = (File) wiz.getProperty(WizardProperties.CONFIG_FILES_FOLDER); File libName = (File) wiz.getProperty(WizardProperties.LIB_FOLDER); String serverInstanceID = (String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID); - String j2eeLevel = (String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); + Profile j2eeProfile = (Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); String librariesDefinition = SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES)); String serverLibraryName = (String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY); - - AntProjectHelper h = EjbJarProjectGenerator.importProject(dirF, name, - sourceFolders, testFolders, configFilesFolder, libName, - j2eeLevel, serverInstanceID, librariesDefinition, serverLibraryName); + + EjbJarProjectCreateData createData = new EjbJarProjectCreateData(); + createData.setProjectDir(dirF); + createData.setName(name); + createData.setSourceFolders(sourceFolders); + createData.setTestFolders(testFolders); + createData.setConfigFilesBase(configFilesFolder); + createData.setLibFolder(libName); + createData.setServerInstanceID(serverInstanceID); + createData.setJavaEEProfile(j2eeProfile); + createData.setLibrariesDefinition(librariesDefinition); + createData.setServerLibraryName(serverLibraryName); + + AntProjectHelper h = EjbJarProjectGenerator.importProject(createData); handle.progress(2); FileObject dir = FileUtil.toFileObject (dirF); diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/NewEjbJarProjectWizardIterator.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/NewEjbJarProjectWizardIterator.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/NewEjbJarProjectWizardIterator.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/NewEjbJarProjectWizardIterator.java @@ -59,6 +59,7 @@ import org.netbeans.modules.j2ee.common.project.ui.ProjectLocationWizardPanel; import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.ejbjarproject.EjbJarProject; import org.netbeans.spi.project.support.ant.AntProjectHelper; @@ -68,6 +69,7 @@ import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectGenerator; import org.netbeans.modules.j2ee.ejbjarproject.Utils; +import org.netbeans.modules.j2ee.ejbjarproject.api.EjbJarProjectCreateData; import org.netbeans.spi.java.project.support.ui.SharableLibrariesUtils; import org.netbeans.spi.project.ui.support.ProjectChooser; import org.openide.util.NbBundle; @@ -113,15 +115,17 @@ if (dirF != null) { dirF = FileUtil.normalizeFile(dirF); } - String name = (String) wiz.getProperty(ProjectLocationWizardPanel.NAME); - String serverInstanceID = (String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID); - String j2eeLevel = (String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); - String librariesDefinition = - SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES)); - String serverLibraryName = (String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY); - AntProjectHelper h = EjbJarProjectGenerator.createProject(dirF, name, - j2eeLevel, serverInstanceID, librariesDefinition, serverLibraryName); + EjbJarProjectCreateData createData = new EjbJarProjectCreateData(); + createData.setProjectDir(dirF); + createData.setName((String) wiz.getProperty(ProjectLocationWizardPanel.NAME)); + createData.setServerInstanceID((String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID)); + createData.setJavaEEProfile((Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL)); + createData.setLibrariesDefinition( + SharabilityUtility.getLibraryLocation((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SHARED_LIBRARIES))); + createData.setServerLibraryName((String) wiz.getProperty(ProjectServerWizardPanel.WIZARD_SERVER_LIBRARY)); + + AntProjectHelper h = EjbJarProjectGenerator.createProject(createData); handle.progress(2); FileObject dir = FileUtil.toFileObject(dirF); @@ -136,8 +140,8 @@ } // remember last used server - UserProjectSettings.getDefault().setLastUsedServer(serverInstanceID); - SharableLibrariesUtils.setLastProjectSharable(librariesDefinition != null); + UserProjectSettings.getDefault().setLastUsedServer(createData.getServerInstanceID()); + SharableLibrariesUtils.setLastProjectSharable(createData.getLibrariesDefinition() != null); // downgrade the Java platform or src level to 1.4 String platformName = (String)wiz.getProperty(ProjectServerWizardPanel.JAVA_PLATFORM); diff --git a/j2ee.ejbjarproject/test/unit/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProviderTest.java b/j2ee.ejbjarproject/test/unit/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProviderTest.java --- a/j2ee.ejbjarproject/test/unit/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProviderTest.java +++ b/j2ee.ejbjarproject/test/unit/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProviderTest.java @@ -44,6 +44,7 @@ import java.io.File; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; +import org.netbeans.modules.j2ee.api.ejbjar.EjbProjectConstants; import org.netbeans.modules.j2ee.common.project.ui.J2EEProjectProperties; import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata; import org.netbeans.modules.j2ee.dd.api.webservices.WebservicesMetadata; @@ -139,11 +140,11 @@ public void testNeedConfigurationFolder() { assertTrue("1.3 needs configuration folder", - EjbJarProvider.needConfigurationFolder(J2EEProjectProperties.J2EE_1_3)); + EjbJarProvider.needConfigurationFolder(EjbProjectConstants.J2EE_13_LEVEL)); assertTrue("1.4 needs configuration folder", - EjbJarProvider.needConfigurationFolder(J2EEProjectProperties.J2EE_1_4)); + EjbJarProvider.needConfigurationFolder(EjbProjectConstants.J2EE_14_LEVEL)); assertFalse("5.0 does not need configuration folder", - EjbJarProvider.needConfigurationFolder(J2EEProjectProperties.JAVA_EE_5)); + EjbJarProvider.needConfigurationFolder(EjbProjectConstants.JAVA_EE_5_LEVEL)); assertFalse("Anything else does not need configuration folder", EjbJarProvider.needConfigurationFolder("5.0")); assertFalse("Anything else does not need configuration folder", diff --git a/j2eeserver/nbproject/project.properties b/j2eeserver/nbproject/project.properties --- a/j2eeserver/nbproject/project.properties +++ b/j2eeserver/nbproject/project.properties @@ -39,7 +39,7 @@ is.autoload=true javac.source=1.5 -spec.version.base=1.57.0 +spec.version.base=1.58.0 javadoc.overview=${basedir}/api/doc/overview.html javadoc.arch=${basedir}/arch.xml diff --git a/j2eeserver/nbproject/project.xml b/j2eeserver/nbproject/project.xml --- a/j2eeserver/nbproject/project.xml +++ b/j2eeserver/nbproject/project.xml @@ -334,6 +334,7 @@ org.netbeans.modules.j2ee.deployment.common.api org.netbeans.modules.j2ee.deployment.devmodules.api + org.netbeans.modules.j2ee.deployment.devmodules.capabilities org.netbeans.modules.j2ee.deployment.devmodules.spi org.netbeans.modules.j2ee.deployment.plugins.api org.netbeans.modules.j2ee.deployment.plugins.spi diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Bundle.properties b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Bundle.properties --- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Bundle.properties +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Bundle.properties @@ -50,3 +50,10 @@ TXT_ServerManager=Servers CTL_Close=Close AD_Close=Close + +J2EE13.displayName=J2EE 1.3 +J2EE14.displayName=J2EE 1.4 +JavaEE5.displayName=Java EE 5 +JavaEE6Full.displayName=Java EE 6 +JavaEE6Web.displayName=Java EE 6 Web + diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Capabilities.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Capabilities.java new file mode 100644 --- /dev/null +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Capabilities.java @@ -0,0 +1,93 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.j2ee.deployment.devmodules.api; + +import java.util.Set; +import org.netbeans.api.project.Project; +import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; + +/** + * + * @author Petr Hejl + */ +public final class Capabilities { + + private final J2eeModuleProvider provider; + + private Capabilities(J2eeModuleProvider provider) { + this.provider = provider; + } + + public static Capabilities forProject(Project project) { + J2eeModuleProvider provider = project.getLookup().lookup(J2eeModuleProvider.class); + if (provider == null) { + return null; + } + return new Capabilities(provider); + } + +// public boolean isEJB21Supported() { +// return false; +// } +// +// public boolean isEJB30Supported() { +// return false; +// } +// +// public boolean isEJB31Supported() { +// return false; +// } +// +// public boolean isEJB31LiteSupported() { +// return false; +// } + + public boolean hasDefaultPersistenceProvider() { + J2eePlatform platform = Deployment.getDefault().getJ2eePlatform(provider.getServerInstanceID()); + if (platform == null) { + // server probably not registered, can't resolve whether default provider is supported (see #79856) + return false; + } + + Set profiles = platform.getSupportedProfiles(provider.getJ2eeModule().getModuleType()); + return (profiles.contains(Profile.JAVA_EE_5) || profiles.contains(Profile.JAVA_EE_6_FULL)) + && platform.isToolSupported("defaultPersistenceProviderJavaEE5"); + } +} diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Deployment.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Deployment.java --- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Deployment.java +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Deployment.java @@ -49,6 +49,7 @@ import java.util.logging.Level; import javax.enterprise.deploy.spi.Target; import javax.enterprise.deploy.spi.status.ProgressObject; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.common.api.Datasource; import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException; import org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener; @@ -333,7 +334,7 @@ * @since 1.6 */ public String[] getServerInstanceIDs(Object[] moduleTypes) { - return getServerInstanceIDs(moduleTypes, null, null); + return getServerInstanceIDs(moduleTypes, (Profile) null, null); } /** @@ -346,10 +347,15 @@ * @return ServerInstanceIDs of all registered server instances that meet * the specified requirements. * @since 1.6 + * @deprecated use {@link #getServerInstanceIDs(java.lang.Object[], org.netbeans.modules.j2ee.deployment.devmodules.api.Profile)} */ public String[] getServerInstanceIDs(Object[] moduleTypes, String specVersion) { return getServerInstanceIDs(moduleTypes, specVersion, null); } + + public String[] getServerInstanceIDs(Object[] moduleTypes, Profile profile) { + return getServerInstanceIDs(moduleTypes, profile, null); + } /** * Return ServerInstanceIDs of all registered server instances that support @@ -362,6 +368,7 @@ * @return ServerInstanceIDs of all registered server instances that meet * the specified requirements. * @since 1.6 + * @deprecated use {@link #getServerInstanceIDs(java.lang.Object[], org.netbeans.modules.j2ee.deployment.capabilities.Profile, java.lang.String[]) } */ public String[] getServerInstanceIDs(Object[] moduleTypes, String specVersion, String[] tools) { List result = new ArrayList(); @@ -370,14 +377,14 @@ J2eePlatform platform = getJ2eePlatform(serverInstanceIDs[i]); if (platform != null) { boolean isOk = true; - if (moduleTypes != null) { + if (moduleTypes != null) { Set platModuleTypes = platform.getSupportedModuleTypes(); for (int j = 0; j < moduleTypes.length; j++) { if (!platModuleTypes.contains(moduleTypes[j])) { isOk = false; } } - } + } if (isOk && specVersion != null) { Set platSpecVers = platform.getSupportedSpecVersions(); if (specVersion.equals(J2eeModule.J2EE_13)) { @@ -402,6 +409,46 @@ return (String[])result.toArray(new String[result.size()]); } + public String[] getServerInstanceIDs(Object[] moduleTypes, Profile profile, String[] tools) { + List result = new ArrayList(); + String[] serverInstanceIDs = getServerInstanceIDs(); + for (int i = 0; i < serverInstanceIDs.length; i++) { + J2eePlatform platform = getJ2eePlatform(serverInstanceIDs[i]); + if (platform != null) { + boolean isOk = true; + if (moduleTypes != null) { + Set platModuleTypes = platform.getSupportedModuleTypes(); + for (int j = 0; j < moduleTypes.length; j++) { + if (!platModuleTypes.contains(moduleTypes[j])) { + isOk = false; + } + } + } + if (isOk && profile != null) { + boolean supported = false; + for (Profile prof : platform.getSupportedProfiles()) { + if (prof == profile) { + supported = true; + break; + } + } + isOk = supported; + } + if (isOk && tools != null) { + for (int j = 0; j < tools.length; j++) { + if (!platform.isToolSupported(tools[j])) { + isOk = false; + } + } + } + if (isOk) { + result.add(serverInstanceIDs[i]); + } + } + } + return (String[]) result.toArray(new String[result.size()]); + } + /** * Returns the display name of the instance identified by the given id. * diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eeModule.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eeModule.java --- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eeModule.java +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eeModule.java @@ -43,7 +43,6 @@ import java.beans.PropertyChangeListener; import java.io.File; -import org.netbeans.modules.j2ee.dd.api.common.RootInterface; import org.netbeans.modules.j2ee.deployment.config.J2eeModuleAccessor; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleImplementation; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; @@ -83,23 +82,26 @@ /** The module is an Client Application archive. */ public static final Object CLIENT = ModuleType.CAR; - /** - * J2EE specification version 1.3 + /** + * J2EE specification version 1.3 * @since 1.5 + * @deprecated use {@link Profile#J2EE_13} */ public static final String J2EE_13 = "1.3"; //NOI18N - /** - * J2EE specification version 1.4 + /** + * J2EE specification version 1.4 * @since 1.5 + * @deprecated use {@link Profile#J2EE_14} */ public static final String J2EE_14 = "1.4"; //NOI18N /** - * + * * JAVA EE 5 specification version - * + * * @since 1.6 + * @deprecated use {@link Profile#JAVA_EE_5} */ - public static final String JAVA_EE_5 = "1.5"; // NOI18N + public static final String JAVA_EE_5 = "1.5"; // NOI18N public static final String APP_XML = "META-INF/application.xml"; public static final String WEB_XML = "WEB-INF/web.xml"; diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eePlatform.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eePlatform.java --- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eePlatform.java +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eePlatform.java @@ -59,6 +59,7 @@ import org.netbeans.api.java.platform.JavaPlatform; import org.netbeans.api.project.libraries.Library; import org.netbeans.api.project.libraries.LibraryManager; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.impl.ServerInstance; import org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformImpl; import org.netbeans.modules.j2ee.deployment.common.api.J2eeLibraryTypeProvider; @@ -71,7 +72,6 @@ import org.openide.util.ImageUtilities; import org.openide.util.Lookup; import org.openide.util.Parameters; -import org.openide.util.Utilities; /** @@ -390,6 +390,7 @@ * class. * * @return list of supported J2EE specification versions. + * @deprecated use {@link #getSupportedProfiles()} */ public Set/**/ getSupportedSpecVersions() { return impl.getSupportedSpecVersions(); @@ -402,11 +403,20 @@ * @param moduleType one of the constants defined in * {@link org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule} * @return list of supported J2EE specification versions. + * @deprecated use {@link #getSupportedProfiles(java.lang.Object)} */ public Set getSupportedSpecVersions(Object moduleType) { return impl.getSupportedSpecVersions(moduleType); } + public Set getSupportedProfiles() { + return impl.getSupportedProfiles(); + } + + public Set getSupportedProfiles(Object moduleType) { + return impl.getSupportedProfiles(moduleType); + } + /** * Return a list of supported J2EE module types. Use module types defined in the * {@link org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule} diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Profile.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Profile.java new file mode 100644 --- /dev/null +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Profile.java @@ -0,0 +1,130 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.j2ee.deployment.devmodules.api; + +import java.util.Comparator; +import org.openide.util.NbBundle; + +/** + * Represents the defined Java EE profiles. + * + * @author Petr Hejl + */ +public final class Profile implements Comparable { + + public static final Comparator REVERSE_COMPARATOR = new Comparator() { + + public int compare(Profile o1, Profile o2) { + return -(o1.compareTo(o2)); + } + }; + + public static final Profile J2EE_13 = new Profile(1, J2eeModule.J2EE_13, "J2EE13.displayName"); + + public static final Profile J2EE_14 = new Profile(2, J2eeModule.J2EE_14, "J2EE14.displayName"); + + public static final Profile JAVA_EE_5 = new Profile(3, J2eeModule.JAVA_EE_5, "JavaEE5.displayName"); + + public static final Profile JAVA_EE_6_FULL = new Profile(4, "EE_6_FULL", "JavaEE6Full.displayName"); + + public static final Profile JAVA_EE_6_WEB = new Profile(5, "EE_6_WEB", "JavaEE6Web.displayName"); + + private final int order; + + private final String name; + + private final String bundleKey; + + private Profile(int order, String name, String bundleKey) { + this.order = order; + this.name = name; + this.bundleKey = bundleKey; + } + + /** + * Returns the UI visible description of the profile. + * + * @return the UI visible description of the profile + */ + public String getDisplayName() { + return NbBundle.getMessage(Profile.class, bundleKey); + } + + public String toPropertiesString() { + return name; + } + + @Override + public String toString() { + return name; + } + + public int compareTo(Profile o) { + return this.order - o.order; + } + + public static Profile fromPropertiesString(String value) { + if (J2EE_13.toPropertiesString().equals(value)) { + return J2EE_13; + } else if (J2EE_14.toPropertiesString().equals(value)) { + return J2EE_14; + } else if (JAVA_EE_5.toPropertiesString().equals(value)) { + return JAVA_EE_5; + } else if (JAVA_EE_6_FULL.toPropertiesString().equals(value)) { + return JAVA_EE_6_FULL; + } else if (JAVA_EE_6_WEB.toPropertiesString().equals(value)) { + return JAVA_EE_6_WEB; + } else { + return null; + } + } + + public static Profile fromDeprecated(String value) { + if (J2eeModule.J2EE_13.equals(value)) { + return J2EE_13; + } else if (J2eeModule.J2EE_14.equals(value)) { + return J2EE_14; + } else if (J2eeModule.JAVA_EE_5.equals(value)) { + return JAVA_EE_5; + } + + return null; + } +} diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/spi/J2eePlatformImpl.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/spi/J2eePlatformImpl.java --- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/spi/J2eePlatformImpl.java +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/spi/J2eePlatformImpl.java @@ -46,8 +46,11 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.io.File; +import java.util.EnumSet; +import java.util.HashSet; import java.util.Set; import org.netbeans.api.java.platform.JavaPlatform; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.spi.project.libraries.LibraryImplementation; import org.openide.util.Lookup; @@ -129,7 +132,7 @@ * * @return list of supported J2EE specification versions. */ - public abstract Set/**/ getSupportedSpecVersions(); + public abstract Set getSupportedSpecVersions(); /** * Return a list of supported J2EE specification versions for @@ -148,7 +151,29 @@ public Set getSupportedSpecVersions(Object moduleType) { return getSupportedSpecVersions(); } - + + public Set getSupportedProfiles() { + Set set = new HashSet(); + for (String spec : getSupportedSpecVersions()) { + Profile profile = Profile.fromDeprecated(spec); + if (profile != null) { + set.add(profile); + } + } + return set; + } + + public Set getSupportedProfiles(Object moduleType) { + Set set = new HashSet(); + for (String spec : getSupportedSpecVersions(moduleType)) { + Profile profile = Profile.fromDeprecated(spec); + if (profile != null) { + set.add(profile); + } + } + return set; + } + /** * Return a list of supported J2EE module types. Use module types defined in the * {@link org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule} diff --git a/web.project/nbproject/project.properties b/web.project/nbproject/project.properties --- a/web.project/nbproject/project.properties +++ b/web.project/nbproject/project.properties @@ -53,7 +53,7 @@ javac.compilerargs=-Xlint:unchecked javadoc.arch=${basedir}/arch.xml -spec.version.base=1.16.0 +spec.version.base=1.17.0 # needed for the TestUtil class test.unit.cp.extra= diff --git a/web.project/nbproject/project.xml b/web.project/nbproject/project.xml --- a/web.project/nbproject/project.xml +++ b/web.project/nbproject/project.xml @@ -148,7 +148,7 @@ 1 - 1.36 + 1.38 @@ -209,7 +209,7 @@ 4 - 1.54 + 1.58 diff --git a/web.project/src/org/netbeans/modules/web/project/Utils.java b/web.project/src/org/netbeans/modules/web/project/Utils.java --- a/web.project/src/org/netbeans/modules/web/project/Utils.java +++ b/web.project/src/org/netbeans/modules/web/project/Utils.java @@ -445,7 +445,7 @@ public static LibraryChooser.Filter getFilter(WebProject p) { LibraryChooser.Filter filter = null; WebModule wm = WebModule.getWebModule(p.getProjectDirectory()); - if (wm != null && "1.3".equals(wm.getJ2eePlatformVersion())) { // NOI18N + if (wm != null && WebModule.J2EE_13_LEVEL.equals(wm.getJ2eePlatformVersion())) { // NOI18N filter = new LibraryChooser.Filter() { public boolean accept(Library library) { if ("javascript".equals(library.getType())) { //NOI18N diff --git a/web.project/src/org/netbeans/modules/web/project/WebContainerImpl.java b/web.project/src/org/netbeans/modules/web/project/WebContainerImpl.java --- a/web.project/src/org/netbeans/modules/web/project/WebContainerImpl.java +++ b/web.project/src/org/netbeans/modules/web/project/WebContainerImpl.java @@ -76,6 +76,7 @@ import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata; import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel; import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction; +import org.netbeans.modules.web.api.webmodule.WebModule; import org.netbeans.modules.web.project.classpath.ClassPathProviderImpl; import org.netbeans.modules.web.spi.webmodule.WebModuleImplementation; import org.netbeans.spi.project.support.ant.AntProjectHelper; @@ -311,7 +312,7 @@ } private static boolean isDescriptorMandatory(String j2eeVersion) { - if ("1.3".equals(j2eeVersion) || "1.4".equals(j2eeVersion)) { + if (WebModule.J2EE_13_LEVEL.equals(j2eeVersion) || WebModule.J2EE_14_LEVEL.equals(j2eeVersion)) { return true; } return false; diff --git a/web.project/src/org/netbeans/modules/web/project/WebPersistenceProviderSupplier.java b/web.project/src/org/netbeans/modules/web/project/WebPersistenceProviderSupplier.java --- a/web.project/src/org/netbeans/modules/web/project/WebPersistenceProviderSupplier.java +++ b/web.project/src/org/netbeans/modules/web/project/WebPersistenceProviderSupplier.java @@ -45,6 +45,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Capabilities; import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; @@ -100,19 +101,7 @@ } public boolean supportsDefaultProvider() { - - J2eeModuleProvider j2eeModuleProvider = (J2eeModuleProvider) project.getLookup().lookup(J2eeModuleProvider.class); - J2eePlatform platform = Deployment.getDefault().getJ2eePlatform(j2eeModuleProvider.getServerInstanceID()); - - if (platform == null){ - // server probably not registered, can't resolve whether default provider is supported (see #79856) - return false; - } - - Set supportedVersions = platform.getSupportedSpecVersions(j2eeModuleProvider.getJ2eeModule().getModuleType()); - - return supportedVersions.contains(J2eeModule.JAVA_EE_5) - && platform.isToolSupported("defaultPersistenceProviderJavaEE5"); + return Capabilities.forProject(project).hasDefaultPersistenceProvider(); } diff --git a/web.project/src/org/netbeans/modules/web/project/api/WebProjectCreateData.java b/web.project/src/org/netbeans/modules/web/project/api/WebProjectCreateData.java --- a/web.project/src/org/netbeans/modules/web/project/api/WebProjectCreateData.java +++ b/web.project/src/org/netbeans/modules/web/project/api/WebProjectCreateData.java @@ -42,6 +42,7 @@ package org.netbeans.modules.web.project.api; import java.io.File; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.openide.filesystems.FileObject; /** @@ -50,13 +51,13 @@ * * @author Radko Najman */ -public class WebProjectCreateData { +public final class WebProjectCreateData { //common to create and import project private File projectDir; private String name; private String serverInstanceID; - private String javaEEVersion; + private Profile javaEEProfile; private String sourceLevel; private String javaPlatformName; private String serverLibraryName; @@ -133,20 +134,31 @@ this.serverInstanceID = serverInstanceID; } + public Profile getJavaEEProfile() { + return javaEEProfile; + } + + public void setJavaEEProfile(Profile javaEEProfile) { + this.javaEEProfile = javaEEProfile; + } + + /** * Gets Java EE version * @return Java EE version + * @deprecated */ public String getJavaEEVersion() { - return javaEEVersion; + return getJavaEEProfile().toPropertiesString(); } /** * Sets Java EE version * @param javaEEVersion Java EE version. Cannot be null. + * @deprecated */ public void setJavaEEVersion(String javaEEVersion) { - this.javaEEVersion = javaEEVersion; + setJavaEEProfile(Profile.fromPropertiesString(javaEEVersion)); } /** diff --git a/web.project/src/org/netbeans/modules/web/project/api/WebProjectUtilities.java b/web.project/src/org/netbeans/modules/web/project/api/WebProjectUtilities.java --- a/web.project/src/org/netbeans/modules/web/project/api/WebProjectUtilities.java +++ b/web.project/src/org/netbeans/modules/web/project/api/WebProjectUtilities.java @@ -54,7 +54,6 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.AntDeploymentHelper; import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; -import org.netbeans.modules.web.api.webmodule.WebModule; import org.netbeans.modules.web.project.*; import org.netbeans.modules.web.project.ui.customizer.WebProjectProperties; import org.netbeans.spi.project.support.ant.AntProjectHelper; @@ -92,6 +91,7 @@ import org.netbeans.modules.j2ee.dd.api.web.WebApp; import org.netbeans.modules.j2ee.dd.api.web.WelcomeFileList; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.java.api.common.ant.UpdateHelper; import org.netbeans.modules.java.api.common.project.ProjectProperties; import org.netbeans.modules.java.api.common.ui.PlatformUiSupport; @@ -188,7 +188,7 @@ String name = createData.getName(); String serverInstanceID = createData.getServerInstanceID(); String sourceStructure = createData.getSourceStructure(); - String j2eeLevel = createData.getJavaEEVersion(); + Profile j2eeProfile = createData.getJavaEEProfile(); String contextPath = createData.getContextPath(); String javaPlatformName = createData.getJavaPlatformName(); String sourceLevel = createData.getSourceLevel(); @@ -196,7 +196,7 @@ assert name != null: "Project name can't be null"; //NOI18N assert serverInstanceID != null: "Server instance ID can't be null"; //NOI18N assert sourceStructure != null: "Source structure can't be null"; //NOI18N - assert j2eeLevel != null: "Java EE version can't be null"; //NOI18N + assert j2eeProfile != null: "Java EE version can't be null"; //NOI18N final boolean createBluePrintsStruct = SRC_STRUCT_BLUEPRINTS.equals(sourceStructure); final boolean createJakartaStructure = SRC_STRUCT_JAKARTA.equals(sourceStructure); @@ -205,7 +205,7 @@ serverInstanceID, projectDir, createData.getServerLibraryName() != null); final AntProjectHelper h = setupProject(projectDir, name, serverInstanceID, - j2eeLevel, createData.getLibrariesDefinition(), serverLibraryName); + j2eeProfile, createData.getLibrariesDefinition(), serverLibraryName); FileObject srcFO = projectDir.createFolder(DEFAULT_SRC_FOLDER); FileObject confFolderFO = null; @@ -241,22 +241,25 @@ // create web.xml // PENDING : should be easier to define in layer and copy related FileObject (doesn't require systemClassLoader) String webXMLContent = null; - if (J2eeModule.JAVA_EE_5.equals(j2eeLevel)) + if (Profile.JAVA_EE_5 == j2eeProfile) { webXMLContent = readResource(Thread.currentThread().getContextClassLoader().getResourceAsStream(RESOURCE_FOLDER + "web-2.5.xml")); //NOI18N - else if (WebModule.J2EE_14_LEVEL.equals(j2eeLevel)) + } else if (Profile.J2EE_14 == j2eeProfile) { webXMLContent = readResource(Thread.currentThread().getContextClassLoader().getResourceAsStream(RESOURCE_FOLDER + "web-2.4.xml")); //NOI18N - else if (WebModule.J2EE_13_LEVEL.equals(j2eeLevel)) + } else if (Profile.J2EE_13 == j2eeProfile) { webXMLContent = readResource(Thread.currentThread().getContextClassLoader().getResourceAsStream(RESOURCE_FOLDER + "web-2.3.xml")); //NOI18N - assert webXMLContent != null : "Cannot find web.xml template for J2EE specification level:" + j2eeLevel; - final String webXmlText = webXMLContent; - FileObject webXML = FileUtil.createData(webInfFO, "web.xml");//NOI18N - FileLock lock = webXML.lock(); - BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(webXML.getOutputStream(lock))); - try { - bw.write(webXmlText); - } finally { - bw.close(); - lock.releaseLock(); + } + // FIXME JAVA_EE_6 + if (webXMLContent != null) { + final String webXmlText = webXMLContent; + FileObject webXML = FileUtil.createData(webInfFO, "web.xml");//NOI18N + FileLock lock = webXML.lock(); + BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(webXML.getOutputStream(lock))); + try { + bw.write(webXmlText); + } finally { + bw.close(); + lock.releaseLock(); + } } EditableProperties ep = h.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); @@ -454,7 +457,7 @@ File[] tstFolders = createData.getTestFolders(); FileObject docBase = createData.getDocBase(); FileObject libFolder = createData.getLibFolder(); - String j2eeLevel = createData.getJavaEEVersion(); + Profile j2eeProfile = createData.getJavaEEProfile(); String serverInstanceID = createData.getServerInstanceID(); String buildfile = createData.getBuildfile(); String javaPlatformName = createData.getJavaPlatformName(); @@ -467,13 +470,13 @@ assert sourceFolders != null: "Source package root can't be null"; //NOI18N assert docBase != null: "Web Pages folder can't be null"; //NOI18N assert serverInstanceID != null: "Server instance ID can't be null"; //NOI18N - assert j2eeLevel != null: "Java EE version can't be null"; //NOI18N + assert j2eeProfile != null: "Java EE version can't be null"; //NOI18N final String serverLibraryName = configureServerLibrary(createData.getLibrariesDefinition(), serverInstanceID, projectDir, createData.getServerLibraryName() != null); final AntProjectHelper antProjectHelper = setupProject(projectDir, name, - serverInstanceID, j2eeLevel, createData.getLibrariesDefinition(), serverLibraryName); + serverInstanceID, j2eeProfile, createData.getLibrariesDefinition(), serverLibraryName); final WebProject p = (WebProject) ProjectManager.getDefault().findProject(antProjectHelper.getProjectDirectory()); final ReferenceHelper referenceHelper = p.getReferenceHelper(); @@ -690,7 +693,7 @@ } private static AntProjectHelper setupProject(FileObject dirFO, String name, - String serverInstanceID, String j2eeLevel, String librariesDefinition, String serverLibraryName) throws IOException { + String serverInstanceID, Profile j2eeProfile, String librariesDefinition, String serverLibraryName) throws IOException { Utils.logUI(NbBundle.getBundle(WebProjectUtilities.class), "UI_WEB_PROJECT_CREATE_SHARABILITY", // NOI18N new Object[]{Boolean.valueOf(librariesDefinition != null), Boolean.valueOf(serverLibraryName != null)}); @@ -733,7 +736,7 @@ ep.setProperty(WebProjectProperties.JSPCOMPILATION_CLASSPATH, "${jspc.classpath}:${javac.classpath}"); - ep.setProperty(WebProjectProperties.J2EE_PLATFORM, j2eeLevel); + ep.setProperty(WebProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); ep.setProperty(WebProjectProperties.WAR_NAME, PropertyUtils.getUsablePropertyName(name) + ".war"); // NOI18N //XXX the name of the dist.ear.jar file should be different, but now it cannot be since the name is used as a key in module provider mapping @@ -825,9 +828,9 @@ // set j2ee.platform.classpath J2eePlatform j2eePlatform = Deployment.getDefault().getJ2eePlatform(serverInstanceID); - if (!j2eePlatform.getSupportedSpecVersions(J2eeModule.WAR).contains(j2eeLevel)) { + if (!j2eePlatform.getSupportedProfiles(J2eeModule.WAR).contains(j2eeProfile)) { Logger.getLogger("global").log(Level.WARNING, - "J2EE level:" + j2eeLevel + " not supported by server " + Deployment.getDefault().getServerInstanceDisplayName(serverInstanceID) + " for module type WAR"); // NOI18N + "J2EE level:" + j2eeProfile.getDisplayName() + " not supported by server " + Deployment.getDefault().getServerInstanceDisplayName(serverInstanceID) + " for module type WAR"); // NOI18N } if (!h.isSharableProject() || serverLibraryName == null) { diff --git a/web.project/src/org/netbeans/modules/web/project/ui/WebLogicalViewProvider.java b/web.project/src/org/netbeans/modules/web/project/ui/WebLogicalViewProvider.java --- a/web.project/src/org/netbeans/modules/web/project/ui/WebLogicalViewProvider.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/WebLogicalViewProvider.java @@ -97,6 +97,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; import org.netbeans.modules.java.api.common.SourceRoots; @@ -535,16 +536,16 @@ } public void actionPerformed(ActionEvent e) { - String j2eeSpec = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH). - getProperty(WebProjectProperties.J2EE_PLATFORM); - if (j2eeSpec == null) { - j2eeSpec = J2EEProjectProperties.JAVA_EE_5; // NOI18N + Profile j2eeProfile = Profile.fromPropertiesString(helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH). + getProperty(WebProjectProperties.J2EE_PLATFORM)); + if (j2eeProfile == null) { + j2eeProfile = Profile.JAVA_EE_5; // NOI18N Logger.getLogger(WebLogicalViewProvider.class.getName()).warning( "project ["+project.getProjectDirectory()+"] is missing "+WebProjectProperties.J2EE_PLATFORM+". " + // NOI18N - "default value will be used instead: "+j2eeSpec); // NOI18N - updateJ2EESpec(project, project.getAntProjectHelper(), j2eeSpec); + "default value will be used instead: "+j2eeProfile); // NOI18N + updateJ2EESpec(project, project.getAntProjectHelper(), j2eeProfile); } - String instance = BrokenServerSupport.selectServer(j2eeSpec, J2eeModule.WAR); + String instance = BrokenServerSupport.selectServer(j2eeProfile, J2eeModule.WAR); if (instance != null) { WebProjectProperties.setServerInstance( project, helper, instance); @@ -552,12 +553,12 @@ checkMissingServer(); } - private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final String j2eeSpec) { + private void updateJ2EESpec(final Project project, final AntProjectHelper helper, final Profile j2eeProfile) { ProjectManager.mutex().postWriteRequest(new Runnable() { public void run() { try { EditableProperties projectProps = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); - projectProps.put(WebProjectProperties.J2EE_PLATFORM, j2eeSpec); + projectProps.put(WebProjectProperties.J2EE_PLATFORM, j2eeProfile.toPropertiesString()); helper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, projectProps); ProjectManager.getDefault().saveProject(project); } catch (IOException e) { diff --git a/web.project/src/org/netbeans/modules/web/project/ui/customizer/Bundle.properties b/web.project/src/org/netbeans/modules/web/project/ui/customizer/Bundle.properties --- a/web.project/src/org/netbeans/modules/web/project/ui/customizer/Bundle.properties +++ b/web.project/src/org/netbeans/modules/web/project/ui/customizer/Bundle.properties @@ -243,10 +243,6 @@ LBL_RelativeURLExample=(e.g. /admin/login.jsp) -JavaEESpecLevel_50=Java EE 5 -J2EESpecLevel_14=J2EE 1.4 -J2EESpecLevel_13=J2EE 1.3 - Label_JVM_Argument=&VM Options: Label_VM_Hint=(used for running main classes or unit tests; e.g. -Xms10m) ACSN_CustomizerRun_NA=N/A diff --git a/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerFrameworks.java b/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerFrameworks.java --- a/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerFrameworks.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerFrameworks.java @@ -52,6 +52,8 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.ListSelectionListener; +import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.web.api.webmodule.ExtenderController; import org.netbeans.modules.web.api.webmodule.ExtenderController.Properties; import org.netbeans.modules.web.spi.webmodule.WebModuleExtender; @@ -110,10 +112,12 @@ return; } initialized = true; - String j2eeVersion = uiProperties.getProject().evaluator().getProperty(WebProjectProperties.J2EE_PLATFORM); + Profile j2eeProfile = Profile.fromPropertiesString(uiProperties.getProject().evaluator().getProperty(WebProjectProperties.J2EE_PLATFORM)); String serverInstanceID = uiProperties.getProject().evaluator().getProperty(WebProjectProperties.J2EE_SERVER_INSTANCE); Properties properties = controller.getProperties(); - properties.setProperty("j2eeLevel", j2eeVersion); // NOI18N + + // FIXME I left string here for compatibility reasons (frameworks) + properties.setProperty(ProjectServerWizardPanel.J2EE_LEVEL, j2eeProfile.toPropertiesString()); // NOI18N properties.setProperty("serverInstanceID", serverInstanceID); // NOI18N jListFrameworks.setModel(new DefaultListModel()); diff --git a/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerRun.java b/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerRun.java --- a/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerRun.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerRun.java @@ -54,6 +54,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.j2ee.deployment.devmodules.api.ServerInstance; import org.netbeans.modules.java.api.common.ant.UpdateHelper; import org.openide.util.HelpCtx; @@ -102,13 +103,10 @@ jCheckBoxDeployOnSave.setModel(uiProperties.DEPLOY_ON_SAVE_MODEL); jComboBoxServer.setModel( uiProperties.J2EE_SERVER_INSTANCE_MODEL ); - String j2eeVersion = jTextFieldJ2EE.getText().trim(); - if (j2eeVersion.equalsIgnoreCase(WebModule.J2EE_13_LEVEL)) - jTextFieldJ2EE_Display.setText(NbBundle.getMessage(CustomizerRun.class, "J2EESpecLevel_13")); //NOI18N; - else if (j2eeVersion.equalsIgnoreCase(WebModule.J2EE_14_LEVEL)) - jTextFieldJ2EE_Display.setText(NbBundle.getMessage(CustomizerRun.class, "J2EESpecLevel_14")); //NOI18N; - else if (j2eeVersion.equalsIgnoreCase(WebModule.JAVA_EE_5_LEVEL)) - jTextFieldJ2EE_Display.setText(NbBundle.getMessage(CustomizerRun.class, "JavaEESpecLevel_50")); //NOI18N; + Profile j2eeProfile = Profile.fromPropertiesString(jTextFieldJ2EE.getText().trim()); + if (j2eeProfile != null) { + jTextFieldJ2EE_Display.setText(j2eeProfile.getDisplayName()); + } setDeployOnSaveState(); } diff --git a/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java b/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java --- a/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java @@ -119,9 +119,6 @@ */ final public class WebProjectProperties { - public static final String J2EE_1_4 = "1.4"; // NOI18N - public static final String J2EE_1_3 = "1.3"; // NOI18N - // Special properties of the project public static final String WEB_PROJECT_NAME = "web.project.name"; //NOI18N public static final String JAVA_PLATFORM = "platform.active"; //NOI18N diff --git a/web.project/src/org/netbeans/modules/web/project/ui/wizards/ImportWebProjectWizardIterator.java b/web.project/src/org/netbeans/modules/web/project/ui/wizards/ImportWebProjectWizardIterator.java --- a/web.project/src/org/netbeans/modules/web/project/ui/wizards/ImportWebProjectWizardIterator.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/wizards/ImportWebProjectWizardIterator.java @@ -76,6 +76,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.web.project.Utils; import org.netbeans.spi.project.ui.support.ProjectChooser; @@ -140,7 +141,7 @@ File[] testFolders = (File[]) wiz.getProperty(WizardProperties.TEST_ROOT); String libName = (String) wiz.getProperty(WizardProperties.LIB_FOLDER); String serverInstanceID = (String) wiz.getProperty(ProjectServerWizardPanel.SERVER_INSTANCE_ID); - String j2eeLevel = (String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); + Profile j2eeProfile = (Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); String webInfFolder = (String) wiz.getProperty(WizardProperties.WEBINF_FOLDER); FileObject wmFO = FileUtil.toFileObject (dirSrcF); @@ -171,8 +172,8 @@ libFolder = FileUtil.toFileObject(f); } - if(j2eeLevel == null) { - j2eeLevel = WebModule.J2EE_14_LEVEL; + if(j2eeProfile == null) { + j2eeProfile = Profile.J2EE_14; } String buildfile = projectLocationWizardPanel.getBuildFile(); @@ -185,7 +186,7 @@ createData.setTestFolders(testFolders); createData.setDocBase(docBase); createData.setLibFolder(libFolder); - createData.setJavaEEVersion(j2eeLevel); + createData.setJavaEEProfile(j2eeProfile); createData.setServerInstanceID(serverInstanceID); createData.setBuildfile(buildfile); createData.setJavaPlatformName((String) wiz.getProperty(ProjectServerWizardPanel.JAVA_PLATFORM)); diff --git a/web.project/src/org/netbeans/modules/web/project/ui/wizards/NewWebProjectWizardIterator.java b/web.project/src/org/netbeans/modules/web/project/ui/wizards/NewWebProjectWizardIterator.java --- a/web.project/src/org/netbeans/modules/web/project/ui/wizards/NewWebProjectWizardIterator.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/wizards/NewWebProjectWizardIterator.java @@ -78,6 +78,7 @@ import org.netbeans.modules.j2ee.common.project.ui.UserProjectSettings; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.web.project.Utils; import org.netbeans.spi.java.project.support.ui.SharableLibrariesUtils; @@ -137,7 +138,7 @@ if (createData.getSourceStructure() == null) { createData.setSourceStructure(WebProjectUtilities.SRC_STRUCT_BLUEPRINTS); } - createData.setJavaEEVersion((String) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL)); + createData.setJavaEEProfile((Profile) wiz.getProperty(ProjectServerWizardPanel.J2EE_LEVEL)); createData.setContextPath((String) wiz.getProperty(ProjectServerWizardPanel.CONTEXT_PATH)); createData.setJavaPlatformName((String) wiz.getProperty(ProjectServerWizardPanel.JAVA_PLATFORM)); createData.setSourceLevel((String) wiz.getProperty(ProjectServerWizardPanel.SOURCE_LEVEL)); diff --git a/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSourceFolders.java b/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSourceFolders.java --- a/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSourceFolders.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSourceFolders.java @@ -57,6 +57,7 @@ import org.netbeans.modules.j2ee.common.project.ui.ProjectLocationWizardPanel; import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.web.project.ProjectWebModule; import org.openide.DialogDisplayer; import org.openide.NotifyDescriptor; @@ -237,8 +238,8 @@ //rather setting to null that refreshing filesystem from a performance reason if (webXml != null && !webXml.isValid()) webXml = null; - String j2eeLevel = (String) wizardDescriptor.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); - if (webXml == null && (j2eeLevel.equals(J2eeModule.J2EE_13) || j2eeLevel.equals(J2eeModule.J2EE_14))) + Profile j2eeProfile = (Profile) wizardDescriptor.getProperty(ProjectServerWizardPanel.J2EE_LEVEL); + if (webXml == null && (j2eeProfile == Profile.J2EE_13 || j2eeProfile == Profile.J2EE_14)) return NbBundle.getMessage(PanelSourceFolders.class, "MSG_FileNotFound", webInf.getPath()); //NOI18N for (int i=0; i + diff --git a/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSupportedFrameworksVisual.java b/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSupportedFrameworksVisual.java --- a/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSupportedFrameworksVisual.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/wizards/PanelSupportedFrameworksVisual.java @@ -61,6 +61,8 @@ import javax.swing.table.AbstractTableModel; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellRenderer; +import org.netbeans.modules.j2ee.common.project.ui.ProjectServerWizardPanel; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Profile; import org.netbeans.modules.web.api.webmodule.ExtenderController; import org.netbeans.modules.web.api.webmodule.ExtenderController.Properties; import org.netbeans.modules.web.spi.webmodule.WebModuleExtender; @@ -284,7 +286,9 @@ void read(WizardDescriptor settings) { Properties properties = controller.getProperties(); properties.setProperty("name", (String) settings.getProperty("name")); // NOI18N - properties.setProperty("j2eeLevel", (String) settings.getProperty("j2eeLevel")); // NOI18N + + // FIXME I left string here for compatibility reasons (frameworks) + properties.setProperty(ProjectServerWizardPanel.J2EE_LEVEL, ((Profile) settings.getProperty(ProjectServerWizardPanel.J2EE_LEVEL)).toPropertiesString()); // NOI18N properties.setProperty("serverInstanceID", (String) settings.getProperty("serverInstanceID")); // NOI18N properties.setProperty("setSourceLevel", (String) settings.getProperty("setSourceLevel")); // NOI18N # HG changeset patch # User Vita Stejskal # Date 1243939300 -7200 # Node ID 63187e3a759a4f2c5205de20bef773ffc00709cc # Parent d4c8e0555fe59b8a729fcc47b38ab33bdfb58c0a improved progress bar messages in RefreshIndices and FileListWork diff --git a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java --- a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java +++ b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java @@ -954,16 +954,24 @@ return false; } }; - private final boolean supportsProgress; + private final String progressTitle; private ProgressHandle progressHandle = null; // private int allLanguagesParsersCount = -1; // private int allLanguagesTasksCount = -1; protected Work(boolean followUpJob, boolean checkEditor, boolean supportsProgress) { + this( + followUpJob, + checkEditor, + supportsProgress ? NbBundle.getMessage(RepositoryUpdater.class, "MSG_BackgroundCompileStart") : null //NOI18N + ); + } + + protected Work(boolean followUpJob, boolean checkEditor, String progressTitle) { this.followUpJob = followUpJob; this.checkEditor = checkEditor; - this.supportsProgress = supportsProgress; + this.progressTitle = progressTitle; } protected final boolean isFollowUpJob() { @@ -1321,8 +1329,8 @@ return finished.get(); } - public final boolean supportsProgress() { - return supportsProgress; + public final String getProgressTitle() { + return progressTitle; } public final void setProgressHandle(ProgressHandle progressHandle) { @@ -1360,7 +1368,7 @@ private final Collection files = new HashSet(); public FileListWork (URL root, boolean followUpJob, boolean checkEditor) { - super(followUpJob, checkEditor, false); + super(followUpJob, checkEditor, true); assert root != null; this.root = root; @@ -1385,7 +1393,7 @@ } protected @Override boolean getDone() { -// updateProgress(root); + updateProgress(root); final FileObject rootFo = URLMapper.findFileObject(root); if (rootFo != null) { try { @@ -1527,7 +1535,7 @@ private final Map> scannedRoots2Dependencies; public RefreshIndices(Set indexerMimeTypes, CustomIndexerFactory indexerFactory, Map> scannedRoots2Depencencies) { - super(false, false, true); + super(false, false, NbBundle.getMessage(RepositoryUpdater.class, "MSG_RefreshingIndices", indexerFactory.getIndexerName())); //NOI18N this.indexerMimeTypes = indexerMimeTypes; this.indexerFactory = indexerFactory; this.scannedRoots2Dependencies = scannedRoots2Depencencies; @@ -1540,6 +1548,7 @@ return true; } + this.updateProgress(root); try { final FileObject rootFo = URLMapper.findFileObject(root); if (rootFo != null) { @@ -2336,10 +2345,19 @@ ProgressHandle progressHandle = null; try { for(Work work = getWork(); work != null; work = getWork()) { - if (progressHandle == null && work.supportsProgress()) { - progressHandle = ProgressHandleFactory.createHandle(NbBundle.getMessage(RepositoryUpdater.class, "MSG_BackgroundCompileStart")); //NOI18N - progressHandle.start(); + if (progressHandle == null) { + if (work.getProgressTitle() != null) { + progressHandle = ProgressHandleFactory.createHandle(work.getProgressTitle()); + progressHandle.start(); + } + } else { + if (work.getProgressTitle() != null) { + progressHandle.setDisplayName(work.getProgressTitle()); + } else { + progressHandle.setDisplayName(NbBundle.getMessage(RepositoryUpdater.class, "MSG_BackgroundCompileStart")); //NOI18N + } } + work.setProgressHandle(progressHandle); try { work.doTheWork(); # HG changeset patch # User Vita Stejskal # Date 1243939321 -7200 # Node ID 736cc56fc229a3007e52c9a5ff90bb05143a1a7a # Parent 63187e3a759a4f2c5205de20bef773ffc00709cc improved progress bar messages in RefreshIndices and FileListWork diff --git a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/Bundle.properties b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/Bundle.properties --- a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/Bundle.properties +++ b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/Bundle.properties @@ -42,3 +42,4 @@ # RepositoryUpdater MSG_BackgroundCompileStart=Scanning projects... MSG_ProjectDependencies=Collecting project dependencies +MSG_RefreshingIndices=Refreshing indices ({0}) # HG changeset patch # User Vita Stejskal # Date 1244013566 -7200 # Node ID ca0a262207050d929ca1c5996dcc83e8fe9d9ff2 # Parent 308f6a2b90f228e9007998383b183bdc34f79e09 # Parent 736cc56fc229a3007e52c9a5ff90bb05143a1a7a Automated merge with http://hg.netbeans.org/jet-main diff --git a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/Bundle.properties b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/Bundle.properties --- a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/Bundle.properties +++ b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/Bundle.properties @@ -42,3 +42,4 @@ # RepositoryUpdater MSG_BackgroundCompileStart=Scanning projects... MSG_ProjectDependencies=Collecting project dependencies +MSG_RefreshingIndices=Refreshing indices ({0}) diff --git a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java --- a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java +++ b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java @@ -954,16 +954,24 @@ return false; } }; - private final boolean supportsProgress; + private final String progressTitle; private ProgressHandle progressHandle = null; // private int allLanguagesParsersCount = -1; // private int allLanguagesTasksCount = -1; protected Work(boolean followUpJob, boolean checkEditor, boolean supportsProgress) { + this( + followUpJob, + checkEditor, + supportsProgress ? NbBundle.getMessage(RepositoryUpdater.class, "MSG_BackgroundCompileStart") : null //NOI18N + ); + } + + protected Work(boolean followUpJob, boolean checkEditor, String progressTitle) { this.followUpJob = followUpJob; this.checkEditor = checkEditor; - this.supportsProgress = supportsProgress; + this.progressTitle = progressTitle; } protected final boolean isFollowUpJob() { @@ -1321,8 +1329,8 @@ return finished.get(); } - public final boolean supportsProgress() { - return supportsProgress; + public final String getProgressTitle() { + return progressTitle; } public final void setProgressHandle(ProgressHandle progressHandle) { @@ -1360,7 +1368,7 @@ private final Collection files = new HashSet(); public FileListWork (URL root, boolean followUpJob, boolean checkEditor) { - super(followUpJob, checkEditor, false); + super(followUpJob, checkEditor, true); assert root != null; this.root = root; @@ -1385,7 +1393,7 @@ } protected @Override boolean getDone() { -// updateProgress(root); + updateProgress(root); final FileObject rootFo = URLMapper.findFileObject(root); if (rootFo != null) { try { @@ -1527,7 +1535,7 @@ private final Map> scannedRoots2Dependencies; public RefreshIndices(Set indexerMimeTypes, CustomIndexerFactory indexerFactory, Map> scannedRoots2Depencencies) { - super(false, false, true); + super(false, false, NbBundle.getMessage(RepositoryUpdater.class, "MSG_RefreshingIndices", indexerFactory.getIndexerName())); //NOI18N this.indexerMimeTypes = indexerMimeTypes; this.indexerFactory = indexerFactory; this.scannedRoots2Dependencies = scannedRoots2Depencencies; @@ -1540,6 +1548,7 @@ return true; } + this.updateProgress(root); try { final FileObject rootFo = URLMapper.findFileObject(root); if (rootFo != null) { @@ -2336,10 +2345,19 @@ ProgressHandle progressHandle = null; try { for(Work work = getWork(); work != null; work = getWork()) { - if (progressHandle == null && work.supportsProgress()) { - progressHandle = ProgressHandleFactory.createHandle(NbBundle.getMessage(RepositoryUpdater.class, "MSG_BackgroundCompileStart")); //NOI18N - progressHandle.start(); + if (progressHandle == null) { + if (work.getProgressTitle() != null) { + progressHandle = ProgressHandleFactory.createHandle(work.getProgressTitle()); + progressHandle.start(); + } + } else { + if (work.getProgressTitle() != null) { + progressHandle.setDisplayName(work.getProgressTitle()); + } else { + progressHandle.setDisplayName(NbBundle.getMessage(RepositoryUpdater.class, "MSG_BackgroundCompileStart")); //NOI18N + } } + work.setProgressHandle(progressHandle); try { work.doTheWork(); # HG changeset patch # User Vita Stejskal # Date 1244024733 -7200 # Node ID cad39e8d9900db19318fc229443df3d374b08a08 # Parent 1e79acf59bd76887f1c7ac4798cd7e173d062816 # Parent ca0a262207050d929ca1c5996dcc83e8fe9d9ff2 Automated merge with http://hg.netbeans.org/jet-main diff --git a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/Bundle.properties b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/Bundle.properties --- a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/Bundle.properties +++ b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/Bundle.properties @@ -42,3 +42,4 @@ # RepositoryUpdater MSG_BackgroundCompileStart=Scanning projects... MSG_ProjectDependencies=Collecting project dependencies +MSG_RefreshingIndices=Refreshing indices ({0}) diff --git a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java --- a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java +++ b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java @@ -954,16 +954,24 @@ return false; } }; - private final boolean supportsProgress; + private final String progressTitle; private ProgressHandle progressHandle = null; // private int allLanguagesParsersCount = -1; // private int allLanguagesTasksCount = -1; protected Work(boolean followUpJob, boolean checkEditor, boolean supportsProgress) { + this( + followUpJob, + checkEditor, + supportsProgress ? NbBundle.getMessage(RepositoryUpdater.class, "MSG_BackgroundCompileStart") : null //NOI18N + ); + } + + protected Work(boolean followUpJob, boolean checkEditor, String progressTitle) { this.followUpJob = followUpJob; this.checkEditor = checkEditor; - this.supportsProgress = supportsProgress; + this.progressTitle = progressTitle; } protected final boolean isFollowUpJob() { @@ -1321,8 +1329,8 @@ return finished.get(); } - public final boolean supportsProgress() { - return supportsProgress; + public final String getProgressTitle() { + return progressTitle; } public final void setProgressHandle(ProgressHandle progressHandle) { @@ -1360,7 +1368,7 @@ private final Collection files = new HashSet(); public FileListWork (URL root, boolean followUpJob, boolean checkEditor) { - super(followUpJob, checkEditor, false); + super(followUpJob, checkEditor, true); assert root != null; this.root = root; @@ -1385,7 +1393,7 @@ } protected @Override boolean getDone() { -// updateProgress(root); + updateProgress(root); final FileObject rootFo = URLMapper.findFileObject(root); if (rootFo != null) { try { @@ -1527,7 +1535,7 @@ private final Map> scannedRoots2Dependencies; public RefreshIndices(Set indexerMimeTypes, CustomIndexerFactory indexerFactory, Map> scannedRoots2Depencencies) { - super(false, false, true); + super(false, false, NbBundle.getMessage(RepositoryUpdater.class, "MSG_RefreshingIndices", indexerFactory.getIndexerName())); //NOI18N this.indexerMimeTypes = indexerMimeTypes; this.indexerFactory = indexerFactory; this.scannedRoots2Dependencies = scannedRoots2Depencencies; @@ -1540,6 +1548,7 @@ return true; } + this.updateProgress(root); try { final FileObject rootFo = URLMapper.findFileObject(root); if (rootFo != null) { @@ -2336,10 +2345,19 @@ ProgressHandle progressHandle = null; try { for(Work work = getWork(); work != null; work = getWork()) { - if (progressHandle == null && work.supportsProgress()) { - progressHandle = ProgressHandleFactory.createHandle(NbBundle.getMessage(RepositoryUpdater.class, "MSG_BackgroundCompileStart")); //NOI18N - progressHandle.start(); + if (progressHandle == null) { + if (work.getProgressTitle() != null) { + progressHandle = ProgressHandleFactory.createHandle(work.getProgressTitle()); + progressHandle.start(); + } + } else { + if (work.getProgressTitle() != null) { + progressHandle.setDisplayName(work.getProgressTitle()); + } else { + progressHandle.setDisplayName(NbBundle.getMessage(RepositoryUpdater.class, "MSG_BackgroundCompileStart")); //NOI18N + } } + work.setProgressHandle(progressHandle); try { work.doTheWork(); # HG changeset patch # User Vita Stejskal # Date 1244028146 -7200 # Node ID a1d247bad1ea8ab36e7aa26fe494ffecb8b62943 # Parent cad39e8d9900db19318fc229443df3d374b08a08 logging diff --git a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/PathRegistry.java b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/PathRegistry.java --- a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/PathRegistry.java +++ b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/PathRegistry.java @@ -494,6 +494,10 @@ libraryResult.addAll(srcRoots); } translatedRoots.put(url, cacheURLs.toArray(new URL[cacheURLs.size()])); + if (LOGGER.isLoggable(Level.FINE)) { + LOGGER.fine("T: " + url + " -> " + cacheURLs); //NOI18N + } + if (isNewSR) { sr.addChangeListener(request.changeListener); } # HG changeset patch # User Vita Stejskal # Date 1244029363 -7200 # Node ID 99e513d14a585c94430bed9a67bd85a8126af0d7 # Parent a1d247bad1ea8ab36e7aa26fe494ffecb8b62943 #166170 - binary roots are included among a source root dependencies diff --git a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java --- a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java +++ b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java @@ -1825,8 +1825,8 @@ ClassPath cp = ClassPath.getClassPath(rootFo, id); if (cp != null) { for (ClassPath.Entry entry : cp.entries()) { - final URL url = entry.getURL(); - final URL[] sourceRoots = PathRegistry.getDefault().sourceForBinaryQuery(url, cp, false); + final URL binaryRoot = entry.getURL(); + final URL[] sourceRoots = PathRegistry.getDefault().sourceForBinaryQuery(binaryRoot, cp, false); if (sourceRoots != null) { for (URL sourceRoot : sourceRoots) { if (!sourceRoot.equals(rootURL) && !ctx.cycleDetector.contains(sourceRoot)) { @@ -1841,11 +1841,17 @@ else { //What does it mean? if (ctx.useInitialState) { - if (!ctx.initialBinaries.contains(url)) { - ctx.newBinariesToScan.add (url); + if (!ctx.initialBinaries.contains(binaryRoot)) { + ctx.newBinariesToScan.add (binaryRoot); } - ctx.oldBinaries.remove(url); + ctx.oldBinaries.remove(binaryRoot); + } else { + ctx.newBinariesToScan.add(binaryRoot); + ctx.oldBinaries.remove(binaryRoot); } + + assert !binaryRoot.equals(rootURL) && !ctx.cycleDetector.contains(binaryRoot); + deps.add(binaryRoot); } } } # HG changeset patch # User Max Sauer # Date 1244030727 -7200 # Node ID 05c113176b5d6cfd61287ff0c63874cb536db7be # Parent 0befd59ff054dbe320f6107fae5f02263a05f5e3 #166327: adding test diff --git a/java.source/test/unit/src/org/netbeans/api/java/source/gen/BreakContinueTest.java b/java.source/test/unit/src/org/netbeans/api/java/source/gen/BreakContinueTest.java --- a/java.source/test/unit/src/org/netbeans/api/java/source/gen/BreakContinueTest.java +++ b/java.source/test/unit/src/org/netbeans/api/java/source/gen/BreakContinueTest.java @@ -77,7 +77,7 @@ public void XtestBreak158130() throws Exception { String test = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { b|reak loop; } } } }"; - String golden = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { break ; } } } }"; + String golden = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { break; } } } }"; testHelper(test, golden, Kind.BREAK, new Delegate() { public void run(WorkingCopy copy, Tree tree) { @@ -91,7 +91,7 @@ public void testBreak158130b() throws Exception { String test = "public class Test { void m(int p) { loop: while (true) { i|f (p == 0) { break loop; } else { break ; } } } }"; - String golden = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { break ; } } } }"; + String golden = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { break; } } } }"; testHelper(test, golden, Kind.IF, new Delegate() { public void run(WorkingCopy copy, Tree tree) { @@ -104,7 +104,7 @@ public void testContinue158130() throws Exception { String test = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { con|tinue loop; } } } }"; - String golden = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { continue ; } } } }"; + String golden = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { continue; } } } }"; testHelper(test, golden, Kind.CONTINUE, new Delegate() { public void run(WorkingCopy copy, Tree tree) { @@ -116,6 +116,41 @@ }); } + public void testBreak166327() throws Exception { + String test = + "public class Test {" + + " public static void test(int y) {" + + " for (int u = y;;) {" + + " if (y == 0)" + + " br|eak;" + + " else" + + " y++;" + + " }" + + " }" + + "}"; + String golden = + "public class Test {" + + " public static void test(int y) {" + + " for (int u = y;;) {" + + " if (y == 0)" + + " break;" + + " else" + + " y++;" + + " }" + + " }" + + "}"; + + testHelper(test, golden, Kind.BREAK, new Delegate() { + + public void run(WorkingCopy copy, Tree tree) { + BreakTree oldBt = (BreakTree) tree; + BreakTree newBt = copy.getTreeMaker().Break(null); + copy.rewrite(oldBt, newBt); + } + + }); + } + @Override String getSourcePckg() { return ""; # HG changeset patch # User Max Sauer # Date 1244030901 -7200 # Node ID bb67814936f5134dbf89aa8ff69db49c81b093c8 # Parent 99e513d14a585c94430bed9a67bd85a8126af0d7 # Parent 05c113176b5d6cfd61287ff0c63874cb536db7be Automated merge with http://hg.netbeans.org/jet-main diff --git a/java.source/test/unit/src/org/netbeans/api/java/source/gen/BreakContinueTest.java b/java.source/test/unit/src/org/netbeans/api/java/source/gen/BreakContinueTest.java --- a/java.source/test/unit/src/org/netbeans/api/java/source/gen/BreakContinueTest.java +++ b/java.source/test/unit/src/org/netbeans/api/java/source/gen/BreakContinueTest.java @@ -77,7 +77,7 @@ public void XtestBreak158130() throws Exception { String test = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { b|reak loop; } } } }"; - String golden = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { break ; } } } }"; + String golden = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { break; } } } }"; testHelper(test, golden, Kind.BREAK, new Delegate() { public void run(WorkingCopy copy, Tree tree) { @@ -91,7 +91,7 @@ public void testBreak158130b() throws Exception { String test = "public class Test { void m(int p) { loop: while (true) { i|f (p == 0) { break loop; } else { break ; } } } }"; - String golden = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { break ; } } } }"; + String golden = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { break; } } } }"; testHelper(test, golden, Kind.IF, new Delegate() { public void run(WorkingCopy copy, Tree tree) { @@ -104,7 +104,7 @@ public void testContinue158130() throws Exception { String test = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { con|tinue loop; } } } }"; - String golden = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { continue ; } } } }"; + String golden = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { continue; } } } }"; testHelper(test, golden, Kind.CONTINUE, new Delegate() { public void run(WorkingCopy copy, Tree tree) { @@ -116,6 +116,41 @@ }); } + public void testBreak166327() throws Exception { + String test = + "public class Test {" + + " public static void test(int y) {" + + " for (int u = y;;) {" + + " if (y == 0)" + + " br|eak;" + + " else" + + " y++;" + + " }" + + " }" + + "}"; + String golden = + "public class Test {" + + " public static void test(int y) {" + + " for (int u = y;;) {" + + " if (y == 0)" + + " break;" + + " else" + + " y++;" + + " }" + + " }" + + "}"; + + testHelper(test, golden, Kind.BREAK, new Delegate() { + + public void run(WorkingCopy copy, Tree tree) { + BreakTree oldBt = (BreakTree) tree; + BreakTree newBt = copy.getTreeMaker().Break(null); + copy.rewrite(oldBt, newBt); + } + + }); + } + @Override String getSourcePckg() { return ""; # HG changeset patch # User ffjre@netbeans.org # Date 1244041625 -7200 # Node ID c6f13ee1b19e428cb4ba9f4240d28c142c1360ba # Parent 42ce5c05d352468b5e7d9bdfd7513a1324310dde # Parent bb67814936f5134dbf89aa8ff69db49c81b093c8 Automated merge diff --git a/java.source/test/unit/src/org/netbeans/api/java/source/gen/BreakContinueTest.java b/java.source/test/unit/src/org/netbeans/api/java/source/gen/BreakContinueTest.java --- a/java.source/test/unit/src/org/netbeans/api/java/source/gen/BreakContinueTest.java +++ b/java.source/test/unit/src/org/netbeans/api/java/source/gen/BreakContinueTest.java @@ -77,7 +77,7 @@ public void XtestBreak158130() throws Exception { String test = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { b|reak loop; } } } }"; - String golden = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { break ; } } } }"; + String golden = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { break; } } } }"; testHelper(test, golden, Kind.BREAK, new Delegate() { public void run(WorkingCopy copy, Tree tree) { @@ -91,7 +91,7 @@ public void testBreak158130b() throws Exception { String test = "public class Test { void m(int p) { loop: while (true) { i|f (p == 0) { break loop; } else { break ; } } } }"; - String golden = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { break ; } } } }"; + String golden = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { break; } } } }"; testHelper(test, golden, Kind.IF, new Delegate() { public void run(WorkingCopy copy, Tree tree) { @@ -104,7 +104,7 @@ public void testContinue158130() throws Exception { String test = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { con|tinue loop; } } } }"; - String golden = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { continue ; } } } }"; + String golden = "public class Test { void m(int p) { loop: while (true) { if (p == 0) { continue; } } } }"; testHelper(test, golden, Kind.CONTINUE, new Delegate() { public void run(WorkingCopy copy, Tree tree) { @@ -116,6 +116,41 @@ }); } + public void testBreak166327() throws Exception { + String test = + "public class Test {" + + " public static void test(int y) {" + + " for (int u = y;;) {" + + " if (y == 0)" + + " br|eak;" + + " else" + + " y++;" + + " }" + + " }" + + "}"; + String golden = + "public class Test {" + + " public static void test(int y) {" + + " for (int u = y;;) {" + + " if (y == 0)" + + " break;" + + " else" + + " y++;" + + " }" + + " }" + + "}"; + + testHelper(test, golden, Kind.BREAK, new Delegate() { + + public void run(WorkingCopy copy, Tree tree) { + BreakTree oldBt = (BreakTree) tree; + BreakTree newBt = copy.getTreeMaker().Break(null); + copy.rewrite(oldBt, newBt); + } + + }); + } + @Override String getSourcePckg() { return ""; diff --git a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/Bundle.properties b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/Bundle.properties --- a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/Bundle.properties +++ b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/Bundle.properties @@ -42,3 +42,4 @@ # RepositoryUpdater MSG_BackgroundCompileStart=Scanning projects... MSG_ProjectDependencies=Collecting project dependencies +MSG_RefreshingIndices=Refreshing indices ({0}) diff --git a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/PathRegistry.java b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/PathRegistry.java --- a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/PathRegistry.java +++ b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/PathRegistry.java @@ -494,6 +494,10 @@ libraryResult.addAll(srcRoots); } translatedRoots.put(url, cacheURLs.toArray(new URL[cacheURLs.size()])); + if (LOGGER.isLoggable(Level.FINE)) { + LOGGER.fine("T: " + url + " -> " + cacheURLs); //NOI18N + } + if (isNewSR) { sr.addChangeListener(request.changeListener); } diff --git a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java --- a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java +++ b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java @@ -954,16 +954,24 @@ return false; } }; - private final boolean supportsProgress; + private final String progressTitle; private ProgressHandle progressHandle = null; // private int allLanguagesParsersCount = -1; // private int allLanguagesTasksCount = -1; protected Work(boolean followUpJob, boolean checkEditor, boolean supportsProgress) { + this( + followUpJob, + checkEditor, + supportsProgress ? NbBundle.getMessage(RepositoryUpdater.class, "MSG_BackgroundCompileStart") : null //NOI18N + ); + } + + protected Work(boolean followUpJob, boolean checkEditor, String progressTitle) { this.followUpJob = followUpJob; this.checkEditor = checkEditor; - this.supportsProgress = supportsProgress; + this.progressTitle = progressTitle; } protected final boolean isFollowUpJob() { @@ -1321,8 +1329,8 @@ return finished.get(); } - public final boolean supportsProgress() { - return supportsProgress; + public final String getProgressTitle() { + return progressTitle; } public final void setProgressHandle(ProgressHandle progressHandle) { @@ -1360,7 +1368,7 @@ private final Collection files = new HashSet(); public FileListWork (URL root, boolean followUpJob, boolean checkEditor) { - super(followUpJob, checkEditor, false); + super(followUpJob, checkEditor, true); assert root != null; this.root = root; @@ -1385,7 +1393,7 @@ } protected @Override boolean getDone() { -// updateProgress(root); + updateProgress(root); final FileObject rootFo = URLMapper.findFileObject(root); if (rootFo != null) { try { @@ -1527,7 +1535,7 @@ private final Map> scannedRoots2Dependencies; public RefreshIndices(Set indexerMimeTypes, CustomIndexerFactory indexerFactory, Map> scannedRoots2Depencencies) { - super(false, false, true); + super(false, false, NbBundle.getMessage(RepositoryUpdater.class, "MSG_RefreshingIndices", indexerFactory.getIndexerName())); //NOI18N this.indexerMimeTypes = indexerMimeTypes; this.indexerFactory = indexerFactory; this.scannedRoots2Dependencies = scannedRoots2Depencencies; @@ -1540,6 +1548,7 @@ return true; } + this.updateProgress(root); try { final FileObject rootFo = URLMapper.findFileObject(root); if (rootFo != null) { @@ -1816,8 +1825,8 @@ ClassPath cp = ClassPath.getClassPath(rootFo, id); if (cp != null) { for (ClassPath.Entry entry : cp.entries()) { - final URL url = entry.getURL(); - final URL[] sourceRoots = PathRegistry.getDefault().sourceForBinaryQuery(url, cp, false); + final URL binaryRoot = entry.getURL(); + final URL[] sourceRoots = PathRegistry.getDefault().sourceForBinaryQuery(binaryRoot, cp, false); if (sourceRoots != null) { for (URL sourceRoot : sourceRoots) { if (!sourceRoot.equals(rootURL) && !ctx.cycleDetector.contains(sourceRoot)) { @@ -1832,11 +1841,17 @@ else { //What does it mean? if (ctx.useInitialState) { - if (!ctx.initialBinaries.contains(url)) { - ctx.newBinariesToScan.add (url); + if (!ctx.initialBinaries.contains(binaryRoot)) { + ctx.newBinariesToScan.add (binaryRoot); } - ctx.oldBinaries.remove(url); + ctx.oldBinaries.remove(binaryRoot); + } else { + ctx.newBinariesToScan.add(binaryRoot); + ctx.oldBinaries.remove(binaryRoot); } + + assert !binaryRoot.equals(rootURL) && !ctx.cycleDetector.contains(binaryRoot); + deps.add(binaryRoot); } } } @@ -2336,10 +2351,19 @@ ProgressHandle progressHandle = null; try { for(Work work = getWork(); work != null; work = getWork()) { - if (progressHandle == null && work.supportsProgress()) { - progressHandle = ProgressHandleFactory.createHandle(NbBundle.getMessage(RepositoryUpdater.class, "MSG_BackgroundCompileStart")); //NOI18N - progressHandle.start(); + if (progressHandle == null) { + if (work.getProgressTitle() != null) { + progressHandle = ProgressHandleFactory.createHandle(work.getProgressTitle()); + progressHandle.start(); + } + } else { + if (work.getProgressTitle() != null) { + progressHandle.setDisplayName(work.getProgressTitle()); + } else { + progressHandle.setDisplayName(NbBundle.getMessage(RepositoryUpdater.class, "MSG_BackgroundCompileStart")); //NOI18N + } } + work.setProgressHandle(progressHandle); try { work.doTheWork(); # HG changeset patch # User phejl@netbeans.org # Date 1244036662 -7200 # Node ID c66015dd2c9e1b5b39cecd34c539f54481d76b48 # Parent b55e03b6486f1d868f787d852928686e4201b705 Removing depercated getSupportedSpecVersion in maven persistence supplier. diff --git a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/MavenPersistenceProviderSupplier.java b/maven.j2ee/src/org/netbeans/modules/maven/j2ee/MavenPersistenceProviderSupplier.java --- a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/MavenPersistenceProviderSupplier.java +++ b/maven.j2ee/src/org/netbeans/modules/maven/j2ee/MavenPersistenceProviderSupplier.java @@ -44,11 +44,10 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Set; import org.netbeans.api.project.Project; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Capabilities; import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; -import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; import org.netbeans.modules.j2ee.persistence.provider.Provider; @@ -106,19 +105,7 @@ } public boolean supportsDefaultProvider() { - - J2eeModuleProvider j2eeModuleProvider = (J2eeModuleProvider) project.getLookup().lookup(J2eeModuleProvider.class); - J2eePlatform platform = Deployment.getDefault().getJ2eePlatform(j2eeModuleProvider.getServerInstanceID()); - - if (platform == null){ - // server probably not registered, can't resolve whether default provider is supported (see #79856) - return false; - } - - Set supportedVersions = platform.getSupportedSpecVersions(j2eeModuleProvider.getJ2eeModule().getModuleType()); - - return supportedVersions.contains(J2eeModule.JAVA_EE_5) - && platform.isToolSupported("defaultPersistenceProviderJavaEE5"); + return Capabilities.forProject(project).hasDefaultPersistenceProvider(); } # HG changeset patch # User phejl@netbeans.org # Date 1244037453 -7200 # Node ID e4bbf5cb2ed704c6b12c328062853a14585876f3 # Parent c66015dd2c9e1b5b39cecd34c539f54481d76b48 Emit info message when deprecated method is called somewhere. diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eePlatform.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eePlatform.java --- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eePlatform.java +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eePlatform.java @@ -393,6 +393,12 @@ * @deprecated use {@link #getSupportedProfiles()} */ public Set/**/ getSupportedSpecVersions() { + boolean assertsEnabled = false; + assert assertsEnabled = true; + if (assertsEnabled) { + LOGGER.log(Level.INFO, "Call to deprecated method " + J2eePlatform.class.getName() + "getSupportedSpecVersions", new Exception()); + } + return impl.getSupportedSpecVersions(); } @@ -406,6 +412,11 @@ * @deprecated use {@link #getSupportedProfiles(java.lang.Object)} */ public Set getSupportedSpecVersions(Object moduleType) { + boolean assertsEnabled = false; + assert assertsEnabled = true; + if (assertsEnabled) { + LOGGER.log(Level.INFO, "Call to deprecated method " + J2eePlatform.class.getName() + "getSupportedSpecVersions", new Exception()); + } return impl.getSupportedSpecVersions(moduleType); } # HG changeset patch # User phejl@netbeans.org # Date 1244038022 -7200 # Node ID c2a1be807e0b84a9c35240677025623f51bf5ebb # Parent e4bbf5cb2ed704c6b12c328062853a14585876f3 Properly deprecated spi methods. diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Profile.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Profile.java --- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Profile.java +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Profile.java @@ -115,16 +115,4 @@ return null; } } - - public static Profile fromDeprecated(String value) { - if (J2eeModule.J2EE_13.equals(value)) { - return J2EE_13; - } else if (J2eeModule.J2EE_14.equals(value)) { - return J2EE_14; - } else if (J2eeModule.JAVA_EE_5.equals(value)) { - return JAVA_EE_5; - } - - return null; - } } diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/spi/J2eePlatformImpl.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/spi/J2eePlatformImpl.java --- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/spi/J2eePlatformImpl.java +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/spi/J2eePlatformImpl.java @@ -131,6 +131,7 @@ * class. * * @return list of supported J2EE specification versions. + * @deprecated override {@link #getSupportedProfiles()} and {@link #getSupportedProfiles(java.lang.Object)} */ public abstract Set getSupportedSpecVersions(); @@ -147,6 +148,7 @@ * @param moduleType one of the constants defined in * {@link org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule} * @return list of supported J2EE specification versions. + * @deprecated override {@link #getSupportedProfiles()} and {@link #getSupportedProfiles(java.lang.Object)} */ public Set getSupportedSpecVersions(Object moduleType) { return getSupportedSpecVersions(); @@ -155,7 +157,7 @@ public Set getSupportedProfiles() { Set set = new HashSet(); for (String spec : getSupportedSpecVersions()) { - Profile profile = Profile.fromDeprecated(spec); + Profile profile = Profile.fromPropertiesString(spec); if (profile != null) { set.add(profile); } @@ -166,7 +168,7 @@ public Set getSupportedProfiles(Object moduleType) { Set set = new HashSet(); for (String spec : getSupportedSpecVersions(moduleType)) { - Profile profile = Profile.fromDeprecated(spec); + Profile profile = Profile.fromPropertiesString(spec); if (profile != null) { set.add(profile); } # HG changeset patch # User ffjre@netbeans.org # Date 1244044115 -7200 # Node ID fb7dc4e61eb6680d293fb5100c705859c122de89 # Parent c6f13ee1b19e428cb4ba9f4240d28c142c1360ba # Parent c2a1be807e0b84a9c35240677025623f51bf5ebb Automated merge diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eePlatform.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eePlatform.java --- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eePlatform.java +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/J2eePlatform.java @@ -393,6 +393,12 @@ * @deprecated use {@link #getSupportedProfiles()} */ public Set/**/ getSupportedSpecVersions() { + boolean assertsEnabled = false; + assert assertsEnabled = true; + if (assertsEnabled) { + LOGGER.log(Level.INFO, "Call to deprecated method " + J2eePlatform.class.getName() + "getSupportedSpecVersions", new Exception()); + } + return impl.getSupportedSpecVersions(); } @@ -406,6 +412,11 @@ * @deprecated use {@link #getSupportedProfiles(java.lang.Object)} */ public Set getSupportedSpecVersions(Object moduleType) { + boolean assertsEnabled = false; + assert assertsEnabled = true; + if (assertsEnabled) { + LOGGER.log(Level.INFO, "Call to deprecated method " + J2eePlatform.class.getName() + "getSupportedSpecVersions", new Exception()); + } return impl.getSupportedSpecVersions(moduleType); } diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Profile.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Profile.java --- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Profile.java +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Profile.java @@ -115,16 +115,4 @@ return null; } } - - public static Profile fromDeprecated(String value) { - if (J2eeModule.J2EE_13.equals(value)) { - return J2EE_13; - } else if (J2eeModule.J2EE_14.equals(value)) { - return J2EE_14; - } else if (J2eeModule.JAVA_EE_5.equals(value)) { - return JAVA_EE_5; - } - - return null; - } } diff --git a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/spi/J2eePlatformImpl.java b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/spi/J2eePlatformImpl.java --- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/spi/J2eePlatformImpl.java +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/spi/J2eePlatformImpl.java @@ -131,6 +131,7 @@ * class. * * @return list of supported J2EE specification versions. + * @deprecated override {@link #getSupportedProfiles()} and {@link #getSupportedProfiles(java.lang.Object)} */ public abstract Set getSupportedSpecVersions(); @@ -147,6 +148,7 @@ * @param moduleType one of the constants defined in * {@link org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule} * @return list of supported J2EE specification versions. + * @deprecated override {@link #getSupportedProfiles()} and {@link #getSupportedProfiles(java.lang.Object)} */ public Set getSupportedSpecVersions(Object moduleType) { return getSupportedSpecVersions(); @@ -155,7 +157,7 @@ public Set getSupportedProfiles() { Set set = new HashSet(); for (String spec : getSupportedSpecVersions()) { - Profile profile = Profile.fromDeprecated(spec); + Profile profile = Profile.fromPropertiesString(spec); if (profile != null) { set.add(profile); } @@ -166,7 +168,7 @@ public Set getSupportedProfiles(Object moduleType) { Set set = new HashSet(); for (String spec : getSupportedSpecVersions(moduleType)) { - Profile profile = Profile.fromDeprecated(spec); + Profile profile = Profile.fromPropertiesString(spec); if (profile != null) { set.add(profile); } diff --git a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/MavenPersistenceProviderSupplier.java b/maven.j2ee/src/org/netbeans/modules/maven/j2ee/MavenPersistenceProviderSupplier.java --- a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/MavenPersistenceProviderSupplier.java +++ b/maven.j2ee/src/org/netbeans/modules/maven/j2ee/MavenPersistenceProviderSupplier.java @@ -44,11 +44,10 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Set; import org.netbeans.api.project.Project; +import org.netbeans.modules.j2ee.deployment.devmodules.api.Capabilities; import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment; import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; -import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; import org.netbeans.modules.j2ee.persistence.provider.Provider; @@ -106,19 +105,7 @@ } public boolean supportsDefaultProvider() { - - J2eeModuleProvider j2eeModuleProvider = (J2eeModuleProvider) project.getLookup().lookup(J2eeModuleProvider.class); - J2eePlatform platform = Deployment.getDefault().getJ2eePlatform(j2eeModuleProvider.getServerInstanceID()); - - if (platform == null){ - // server probably not registered, can't resolve whether default provider is supported (see #79856) - return false; - } - - Set supportedVersions = platform.getSupportedSpecVersions(j2eeModuleProvider.getJ2eeModule().getModuleType()); - - return supportedVersions.contains(J2eeModule.JAVA_EE_5) - && platform.isToolSupported("defaultPersistenceProviderJavaEE5"); + return Capabilities.forProject(project).hasDefaultPersistenceProvider(); } # HG changeset patch # User Jiri Skrivanek # Date 1244039176 -7200 # Node ID 600c3631fcb35c37988351a99551033e6d9ebc66 # Parent 1e79acf59bd76887f1c7ac4798cd7e173d062816 #166035 - formatting someimes fail, so report input parameters for diagnostic. diff --git a/openide.loaders/src/org/openide/text/DataEditorSupport.java b/openide.loaders/src/org/openide/text/DataEditorSupport.java --- a/openide.loaders/src/org/openide/text/DataEditorSupport.java +++ b/openide.loaders/src/org/openide/text/DataEditorSupport.java @@ -231,8 +231,15 @@ } } - return NbBundle.getMessage (DataObject.class, "LAB_EditorName", - new Integer (version), name ); + try { + return NbBundle.getMessage(DataObject.class, "LAB_EditorName", + new Integer(version), name); + } catch (IllegalArgumentException iae) { + // #166035 - formatting someimes fail, so report input parameters + String pattern = NbBundle.getMessage(DataObject.class, "LAB_EditorName"); + ERR.log(Level.WARNING, "Formatting failed. pattern=" + pattern + ", version=" + version + ", name=" + name, iae); //NOI18N + return name; + } } @Override # HG changeset patch # User ffjre@netbeans.org # Date 1244046386 -7200 # Node ID 7105982e29aa5a26cb8d0aed525edcf866c2ebc3 # Parent fb7dc4e61eb6680d293fb5100c705859c122de89 # Parent 600c3631fcb35c37988351a99551033e6d9ebc66 Automated merge diff --git a/openide.loaders/src/org/openide/text/DataEditorSupport.java b/openide.loaders/src/org/openide/text/DataEditorSupport.java --- a/openide.loaders/src/org/openide/text/DataEditorSupport.java +++ b/openide.loaders/src/org/openide/text/DataEditorSupport.java @@ -231,8 +231,15 @@ } } - return NbBundle.getMessage (DataObject.class, "LAB_EditorName", - new Integer (version), name ); + try { + return NbBundle.getMessage(DataObject.class, "LAB_EditorName", + new Integer(version), name); + } catch (IllegalArgumentException iae) { + // #166035 - formatting someimes fail, so report input parameters + String pattern = NbBundle.getMessage(DataObject.class, "LAB_EditorName"); + ERR.log(Level.WARNING, "Formatting failed. pattern=" + pattern + ", version=" + version + ", name=" + name, iae); //NOI18N + return name; + } } @Override # HG changeset patch # User ffjre@netbeans.org # Date 1244041184 -14400 # Node ID 88009b4a54ea3c64a6bf782cccaef9406d61039e # Parent c2a1be807e0b84a9c35240677025623f51bf5ebb # Parent 13a6ef7f7847c32790e637ddc47c1e5bc30d2d2d Automated merge with http://hg.netbeans.org/web-main diff --git a/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java b/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java --- a/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java +++ b/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java @@ -78,7 +78,7 @@ } private static APTFileCacheEntry create(CharSequence filePath, boolean serial) { - return new APTFileCacheEntry(filePath, serial, serial ? new HashMap() : new ConcurrentHashMap(), new HashMap()); + return new APTFileCacheEntry(filePath, serial, serial ? new HashMap() : new ConcurrentHashMap(), serial ? new HashMap() : new ConcurrentHashMap()); } public boolean isSerial() { diff --git a/cnd.discovery/nbproject/project.xml b/cnd.discovery/nbproject/project.xml --- a/cnd.discovery/nbproject/project.xml +++ b/cnd.discovery/nbproject/project.xml @@ -190,6 +190,7 @@ org.netbeans.modules.cnd + org.netbeans.modules.cnd.remote @@ -222,6 +223,7 @@ org.netbeans.modules.editor.mimelookup + org.netbeans.modules.masterfs diff --git a/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/bridge/ProjectBridge.java b/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/bridge/ProjectBridge.java --- a/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/bridge/ProjectBridge.java +++ b/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/bridge/ProjectBridge.java @@ -147,7 +147,11 @@ public void checkForNewExtensions(Set needAdd){ Set extensions = new HashSet(); for(String name : needAdd){ - int i = name.lastIndexOf('.'); + int i = name.replace('\\', '/').lastIndexOf('/'); + if (i >= 0){ + name = name.substring(i+1); + } + i = name.lastIndexOf('.'); if (i > 0){ String extension = name.substring(i+1); if (extension.length()>0) { diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/CMakeTestCase.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/CMakeTestCase.java new file mode 100644 --- /dev/null +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/CMakeTestCase.java @@ -0,0 +1,56 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.cnd.discovery.project; + +/** + * + * @author Alexander Simon + */ +public class CMakeTestCase extends MakeProjectBase { + + public CMakeTestCase() { + super("CMake"); + } + + public void testCmake(){ + performTestProject("http://www.cmake.org/files/v2.6/cmake-2.6.4.tar.gz", null); + } +} + diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/DiscoverySuiteTest.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/DiscoverySuiteTest.java new file mode 100644 --- /dev/null +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/DiscoverySuiteTest.java @@ -0,0 +1,66 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.cnd.discovery.project; + +import junit.framework.Test; +import junit.framework.TestSuite; +import org.netbeans.modules.cnd.test.BaseTestSuite; + +/** + * + * @author Alexander Simon + */ +public class DiscoverySuiteTest extends BaseTestSuite { + + public DiscoverySuiteTest() { + super("C/C++ Discovery Test"); // NOI18N + + addTestSuite(PkgConfigTestCase.class); + addTestSuite(LiteSqlTestCase.class); + addTestSuite(ProjectCreationTestCase.class); + addTestSuite(CMakeTestCase.class); + addTestSuite(MysqlConnectorTestCase.class); + } + + public static Test suite() { + TestSuite suite = new DiscoverySuiteTest(); + return suite; + } +} diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/LiteSqlTestCase.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/LiteSqlTestCase.java new file mode 100644 --- /dev/null +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/LiteSqlTestCase.java @@ -0,0 +1,64 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.cnd.discovery.project; + +import org.openide.util.Utilities; + + +/** + * + * @author Alexander Simon + */ +public class LiteSqlTestCase extends MakeProjectBase { + + public LiteSqlTestCase() { + super("LiteSql"); + } + + public void testLiteSql(){ + if (Utilities.isWindows()) { + // make does not work on windows + // it start XWin and all hangs + // do anybody know how to make litesql on windows? + return; + } + performTestProject("http://www.mirrorservice.org/sites/download.sourceforge.net/pub/sourceforge/l/li/litesql/litesql-0.3.3.tar.gz", null); + } +} \ No newline at end of file diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java --- a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MakeProjectBase.java @@ -41,6 +41,7 @@ import java.io.File; import java.io.IOException; +import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; @@ -48,9 +49,10 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ui.OpenProjects; import org.netbeans.junit.MockServices; -import org.netbeans.junit.NbTestCase; import org.netbeans.modules.cnd.api.execution.ExecutionListener; import org.netbeans.modules.cnd.api.execution.NativeExecutor; +import org.netbeans.modules.cnd.api.model.CsmFile; +import org.netbeans.modules.cnd.api.model.CsmInclude; import org.netbeans.modules.cnd.api.model.CsmModel; import org.netbeans.modules.cnd.api.model.CsmModelAccessor; import org.netbeans.modules.cnd.api.model.CsmProject; @@ -59,6 +61,8 @@ import org.netbeans.modules.cnd.makeproject.MakeProjectType; import org.netbeans.modules.cnd.modelimpl.csm.core.ModelImpl; import org.netbeans.modules.cnd.modelimpl.repository.RepositoryUtils; +import org.netbeans.modules.cnd.test.BaseTestCase; +import org.netbeans.modules.cnd.test.CndCoreTestUtils; import org.openide.WizardDescriptor; import org.openide.util.Cancellable; import org.openide.util.Exceptions; @@ -68,24 +72,36 @@ * * @author Alexander Simon */ -public abstract class MakeProjectBase extends NbTestCase { +public abstract class MakeProjectBase extends BaseTestCase { private static final boolean OPTIMIZE_NATIVE_EXECUTIONS =true; + private static final boolean TRACE = true; public MakeProjectBase(String name) { super(name); - System.setProperty("org.netbeans.modules.cnd.makeproject.api.runprofiles", "true"); // NOI18N - System.setProperty("cnd.mode.unittest", "true"); + if (TRACE) { + System.setProperty("cnd.discovery.trace.projectimport", "true"); // NOI18N + } + //System.setProperty("org.netbeans.modules.cnd.makeproject.api.runprofiles", "true"); // NOI18N + //System.setProperty("cnd.mode.unittest", "true"); System.setProperty("cnd.make.project.creation.skip.notify.header.extension", "true"); - Logger.getLogger("org.netbeans.modules.editor.settings.storage.Utils").setLevel(Level.SEVERE); + //Logger.getLogger("org.netbeans.modules.editor.settings.storage.Utils").setLevel(Level.SEVERE); } @Override protected void setUp() throws Exception { super.setUp(); - MockServices.setServices(MakeProjectType.class); + //MockServices.setServices(MakeProjectType.class); startupModel(); } + @Override + protected List getServises() { + List list = new ArrayList(); + list.add(MakeProjectType.class); + list.addAll(super.getServises()); + return list; + } + private void startupModel() { ModelImpl model = (ModelImpl) CsmModelAccessor.getModel(); model.startup(); @@ -143,7 +159,11 @@ return path+"/configure"; } } else if ("realFlags".equals(name)) { - return "CFLAGS=\"-g3 -gdwarf-2\" CXXFLAGS=\"-g3 -gdwarf-2\""; + if (path.indexOf("cmake-")>0) { + return "CFLAGS=\"-g3 -gdwarf-2\" CXXFLAGS=\"-g3 -gdwarf-2\" CMAKE_BUILD_TYPE=Debug CMAKE_CXX_FLAGS_DEBUG=\"-g3 -gdwarf-2\" CMAKE_C_FLAGS_DEBUG=\"-g3 -gdwarf-2\""; + } else { + return "CFLAGS=\"-g3 -gdwarf-2\" CXXFLAGS=\"-g3 -gdwarf-2\""; + } } else if ("buildProject".equals(name)) { if (OPTIMIZE_NATIVE_EXECUTIONS && makeFile.exists() && findObjectFiles(path)) { // optimization on developer computer: @@ -204,33 +224,27 @@ return false; } - abstract void perform(CsmProject csmProject); + protected void perform(CsmProject csmProject) { + if (TRACE) { + System.err.println("Model content:"); + } + for (CsmFile file : csmProject.getAllFiles()) { + if (TRACE) { + System.err.println("\t"+file.getAbsolutePath()); + } + for(CsmInclude include : file.getIncludes()){ + assertTrue("Not resolved include directive "+include.getIncludeName()+" in file "+file.getAbsolutePath(), include.getIncludeFile() != null); + } + } + } private String download(String urlName, List additionalScripts) throws IOException { String zipName = urlName.substring(urlName.lastIndexOf('/')+1); String tarName = zipName.substring(0, zipName.lastIndexOf('.')); String packageName = tarName.substring(0, tarName.lastIndexOf('.')); + File fileDataPath = CndCoreTestUtils.getDownloadBase(); + String dataPath = fileDataPath.getAbsolutePath(); - String dataPath; - if (false) { - // local downloads - dataPath = getDataDir().getAbsolutePath(); - if (dataPath.endsWith("/data") || dataPath.endsWith("\\data")) { - dataPath = dataPath.substring(0, dataPath.length()-4)+"downloads"; - } - } else { - // downloads in tmp dir - dataPath = System.getProperty("java.io.tmpdir"); - if (dataPath.endsWith(File.separator)) { - dataPath += System.getProperty("user.name") + "-cnd-test-downloads"; - } else { - dataPath += File.separator + System.getProperty("user.name") + "-cnd-test-downloads"; - } - } - File fileDataPath = new File(dataPath); - if (!fileDataPath.exists()) { - fileDataPath.mkdirs(); - } String createdFolder = dataPath+"/"+packageName; final AtomicBoolean finish = new AtomicBoolean(false); ExecutionListener listener = new ExecutionListener() { diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTest.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTestCase.java rename from cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTest.java rename to cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTestCase.java --- a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTest.java +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/MysqlConnectorTestCase.java @@ -41,47 +41,20 @@ import java.util.ArrayList; import java.util.List; -import org.netbeans.modules.cnd.api.model.CsmFile; -import org.netbeans.modules.cnd.api.model.CsmInclude; -import org.netbeans.modules.cnd.api.model.CsmProject; /** * * @author Alexander Simon */ -public class MysqlConnectorTest extends MakeProjectBase { - private static final boolean TRACE = true; +public class MysqlConnectorTestCase extends MakeProjectBase { - public MysqlConnectorTest() { - super("MysqlConnectorTest"); - if (TRACE) { - System.setProperty("cnd.discovery.trace.projectimport", "true"); // NOI18N - } - - } - - public void testCmake(){ - performTestProject("http://www.cmake.org/files/v2.6/cmake-2.6.4.tar.gz", null); + public MysqlConnectorTestCase() { + super("MysqlConnector"); } public void testMysqlConnector(){ List list = new ArrayList(); - list.add("../cmake-2.6.4/bin/cmake -G \"Unix Makefiles\" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS=\"-g3 -gdwarf-2\" -DCMAKE_C_FLAGS=\"-g3 -gdwarf-2\""); + list.add("../cmake-2.6.4/bin/cmake -G \"Unix Makefiles\" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS_DEBUG=\"-g3 -gdwarf-2\" -DCMAKE_C_FLAGS_DEBUG=\"-g3 -gdwarf-2\""); performTestProject("http://download.softagency.net/MySQL/Downloads/Connector-C/mysql-connector-c-6.0.1.tar.gz", list); } - - @Override - void perform(CsmProject csmProject) { - if (TRACE) { - System.err.println("Model content:"); - } - for (CsmFile file : csmProject.getAllFiles()) { - if (TRACE) { - System.err.println("\t"+file.getAbsolutePath()); - } - for(CsmInclude include : file.getIncludes()){ - assertTrue("Not resolved include directive "+include.getIncludeName()+" in file "+file.getAbsolutePath(), include.getIncludeFile() != null); - } - } - } } diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/PkgConfigTestCase.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/PkgConfigTestCase.java new file mode 100644 --- /dev/null +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/PkgConfigTestCase.java @@ -0,0 +1,55 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2009 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.cnd.discovery.project; + +/** + * + * @author Alexander Simon + */ +public class PkgConfigTestCase extends MakeProjectBase { + + public PkgConfigTestCase() { + super("PkgConfig"); + } + + public void testPkgConfig(){ + performTestProject("http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz", null); + } +} \ No newline at end of file diff --git a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTest.java b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTestCase.java rename from cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTest.java rename to cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTestCase.java --- a/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTest.java +++ b/cnd.discovery/test/unit/src/org/netbeans/modules/cnd/discovery/project/ProjectCreationTestCase.java @@ -39,56 +39,17 @@ package org.netbeans.modules.cnd.discovery.project; -import org.netbeans.modules.cnd.api.model.CsmFile; -import org.netbeans.modules.cnd.api.model.CsmInclude; -import org.netbeans.modules.cnd.api.model.CsmProject; -import org.openide.util.Utilities; - /** * * @author Alexander Simon */ -public class ProjectCreationTest extends MakeProjectBase { - private static final boolean TRACE = true; +public class ProjectCreationTestCase extends MakeProjectBase { - public ProjectCreationTest() { - super("ProjectCreationTest"); - if (TRACE) { - System.setProperty("cnd.discovery.trace.projectimport", "true"); // NOI18N - } - - } - - public void testPkgConfig(){ - performTestProject("http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz", null); - } - - public void testLiteSql(){ - if (Utilities.isWindows()) { - // make does not work on windows - // it start XWin and all hangs - // do anybody know how to make litesql on windows? - return; - } - performTestProject("http://www.mirrorservice.org/sites/download.sourceforge.net/pub/sourceforge/l/li/litesql/litesql-0.3.3.tar.gz", null); + public ProjectCreationTestCase() { + super("Tesseract"); } public void testTesseract(){ performTestProject("http://tesseract-ocr.googlecode.com/files/tesseract-2.03.tar.gz", null); } - - @Override - void perform(CsmProject csmProject) { - if (TRACE) { - System.err.println("Model content:"); - } - for (CsmFile file : csmProject.getAllFiles()) { - if (TRACE) { - System.err.println("\t"+file.getAbsolutePath()); - } - for(CsmInclude include : file.getIncludes()){ - assertTrue("Not resolved include directive "+include.getIncludeName()+" in file "+file.getAbsolutePath(), include.getIncludeFile() != null); - } - } - } } diff --git a/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/PkgConfigImpl.java b/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/PkgConfigImpl.java --- a/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/PkgConfigImpl.java +++ b/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/PkgConfigImpl.java @@ -174,7 +174,7 @@ return new ResolvedPathImpl(pairs.get(0).path, pairs.get(0).configurations); } else { String path = pairs.get(0).path; - Set set = new LinkedHashSet(); + Set set = new LinkedHashSet(); for(Pair p : pairs){ set.addAll(p.configurations); } @@ -339,7 +339,7 @@ } List list = res.get(key); if (list == null){ - list = new ArrayList(1); + list = new ArrayList(1); res.put(key, list); } if (!list.contains(pkg)){ diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTRestorePreprocStateWalker.java @@ -135,11 +135,11 @@ APTFile aptLight = inclFileOwner.getAPTLight(csmFile); if (aptLight != null) { APTPreprocHandler preprocHandler = getPreprocHandler(); - APTFileCacheEntry cacheEntry = csmFile.getAPTCacheEntry(preprocHandler, false); + APTFileCacheEntry cacheEntry = csmFile.getAPTCacheEntry(preprocHandler, true); APTWalker walker = new APTRestorePreprocStateWalker(getStartProject(), aptLight, csmFile, preprocHandler,cacheEntry); walker.visit(); - // remember walk info - csmFile.setAPTCacheEntry(preprocHandler, cacheEntry, false); + // does not remember walk info to safe memory + // csmFile.setAPTCacheEntry(preprocHandler, cacheEntry, false); } else { // expected #included file was deleted csmFile = null; diff --git a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/parser/apt/APTSelfWalker.java @@ -70,10 +70,10 @@ try { APTFile apt = APTDriver.getInstance().findAPTLight(new FileBufferFile(new File(resolvedPath.getPath().toString()))); APTPreprocHandler preprocHandler = getPreprocHandler(); - APTFileCacheEntry cache = APTFileCacheManager.getEntry(resolvedPath.getPath(),preprocHandler, false); + APTFileCacheEntry cache = APTFileCacheManager.getEntry(resolvedPath.getPath(),preprocHandler, true); createIncludeWalker(apt, this, resolvedPath.getPath(), cache).visit(); - // remember walk - APTFileCacheManager.setAPTCacheEntry(resolvedPath.getPath(), preprocHandler, cache, false); + // does not remember walk to safe memory + // APTFileCacheManager.setAPTCacheEntry(resolvedPath.getPath(), preprocHandler, cache, false); } catch (FileNotFoundException ex) { APTUtils.LOG.log(Level.WARNING, "APTSelfWalker: file {0} not found", new Object[] {resolvedPath.getPath()});// NOI18N DiagnosticExceptoins.register(ex); @@ -95,4 +95,5 @@ protected boolean hasIncludeActionSideEffects() { return false; } -} \ No newline at end of file +} + diff --git a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java --- a/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java +++ b/cnd.repository/test/unit/src/org/netbeans/modules/cnd/repository/impl/RepositoryValidationBase.java @@ -47,7 +47,7 @@ import org.netbeans.modules.cnd.modelimpl.csm.core.ProjectBase; import org.netbeans.modules.cnd.modelimpl.csm.core.Tracer; import org.netbeans.modules.cnd.modelimpl.trace.TraceModelTestBase; -import org.openide.filesystems.FileUtil; +import org.netbeans.modules.cnd.test.CndCoreTestUtils; import org.openide.util.Exceptions; /** @@ -163,22 +163,8 @@ // tar xf pkgconfig-0.18.tar private List download() throws IOException{ List list = new ArrayList(); - String dataPath; - if (false) { - // local downloads - dataPath = getDataDir().getAbsolutePath(); - if (dataPath.endsWith("/data") || dataPath.endsWith("\\data")) { - dataPath = dataPath.substring(0, dataPath.length()-4)+"downloads"; - } - } else { - // downloads in tmp dir - dataPath = System.getProperty("java.io.tmpdir"); - if (dataPath.endsWith(File.separator)) { - dataPath += System.getProperty("user.name") + "-cnd-test-downloads"; - } else { - dataPath += File.separator + System.getProperty("user.name") + "-cnd-test-downloads"; - } - } + File fileDataPath = CndCoreTestUtils.getDownloadBase(); + String dataPath = fileDataPath.getAbsolutePath(); final AtomicBoolean finish = new AtomicBoolean(false); ExecutionListener listener = new ExecutionListener() { public void executionStarted() { @@ -188,19 +174,19 @@ } }; NativeExecutor ne = null; - File file = new File(dataPath + "/pkgconfig-0.18"); + File file = new File(dataPath + "/pkg-config-0.23"); if (!file.exists()){ file.mkdirs(); } if (file.list().length == 0){ ne = new NativeExecutor(dataPath,"wget", - "http://pkgconfig.freedesktop.org/releases/pkgconfig-0.18.tar.gz",new String[0],"wget","run",false,false); + "http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz",new String[0],"wget","run",false,false); waitExecution(ne, listener, finish); ne = new NativeExecutor(dataPath,"gzip", - "-d pkgconfig-0.18.tar.gz",new String[0],"gzip","run",false,false); + "-d pkg-config-0.23.tar.gz",new String[0],"gzip","run",false,false); waitExecution(ne, listener, finish); ne = new NativeExecutor(dataPath,"tar", - "xf pkgconfig-0.18.tar",new String[0],"tar","run",false,false); + "xf pkg-config-0.23.tar",new String[0],"tar","run",false,false); waitExecution(ne, listener, finish); } @@ -219,7 +205,7 @@ "xf litesql-0.3.3.tar",new String[0],"tar","run",false,false); waitExecution(ne, listener, finish); } - list.add(dataPath + "/pkgconfig-0.18"); //NOI18N + list.add(dataPath + "/pkg-config-0.23"); //NOI18N list.add(dataPath + "/litesql-0.3.3"); //NOI18N for(String f : list){ file = new File(f); @@ -227,7 +213,7 @@ } list = expandAndSort(list); list.add("-DHAVE_CONFIG_H"); - list.add("-I"+dataPath + "/pkgconfig-0.18"); + list.add("-I"+dataPath + "/pkg-config-0.23"); list.add("-I"+dataPath + "/litesql-0.3.3"); return list; } diff --git a/cnd/test/unit/src/org/netbeans/modules/cnd/test/BaseTestCase.java b/cnd/test/unit/src/org/netbeans/modules/cnd/test/BaseTestCase.java --- a/cnd/test/unit/src/org/netbeans/modules/cnd/test/BaseTestCase.java +++ b/cnd/test/unit/src/org/netbeans/modules/cnd/test/BaseTestCase.java @@ -46,6 +46,9 @@ import java.io.FileWriter; import java.io.IOException; import java.io.Writer; +import java.util.ArrayList; +import java.util.List; +import java.util.Collections; import java.util.TreeSet; import java.util.logging.Level; import java.util.logging.Logger; @@ -168,7 +171,12 @@ Logger.getLogger("org.netbeans.modules.editor.settings.storage.Utils").setLevel(Level.SEVERE); System.setProperty("cnd.mode.unittest", "true"); - MockServices.setServices(MockMimeLookup.class); + List list = new ArrayList(); + list.add(MockMimeLookup.class); + for(Class cls : getServises()){ + list.add(cls); + } + MockServices.setServices(list.toArray(new Class[list.size()])); MimePath mimePath = MimePath.parse(MIMENames.CPLUSPLUS_MIME_TYPE); MockMimeLookup.setInstances(mimePath, new CCKit()); mimePath = MimePath.parse(MIMENames.HEADER_MIME_TYPE); @@ -179,6 +187,10 @@ MockMimeLookup.setInstances(mimePath, new FKit()); } + protected List getServises(){ + return Collections.emptyList(); + } + /** * Get the test method specific data file; * usually it is ${xtest.data}/${classname}/filename diff --git a/cnd/test/unit/src/org/netbeans/modules/cnd/test/CndCoreTestUtils.java b/cnd/test/unit/src/org/netbeans/modules/cnd/test/CndCoreTestUtils.java --- a/cnd/test/unit/src/org/netbeans/modules/cnd/test/CndCoreTestUtils.java +++ b/cnd/test/unit/src/org/netbeans/modules/cnd/test/CndCoreTestUtils.java @@ -54,6 +54,7 @@ import org.netbeans.editor.Utilities; import org.netbeans.junit.Manager; import org.openide.cookies.EditorCookie; +import org.openide.filesystems.FileUtil; import org.openide.loaders.DataObject; import org.openide.util.UserQuestionException; @@ -200,4 +201,24 @@ public static int getDocumentOffset(BaseDocument doc, int lineIndex, int colIndex) { return Utilities.getRowStartFromLineOffset(doc, lineIndex -1) + (colIndex - 1); } + + /** + * get common place for long living test base + * @return + */ + public static File getDownloadBase(){ + // downloads in tmp dir + String dataPath = System.getProperty("java.io.tmpdir"); + if (dataPath.endsWith(File.separator)) { + dataPath += System.getProperty("user.name") + "-cnd-test-downloads"; + } else { + dataPath += File.separator + System.getProperty("user.name") + "-cnd-test-downloads"; + } + File fileDataPath = new File(dataPath); + if (!fileDataPath.exists()) { + fileDataPath.mkdirs(); + } + return FileUtil.normalizeFile(fileDataPath); + } + } # HG changeset patch # User Jindrich Sedek # Date 1244039040 -7200 # Node ID b27e82eef1992b41a35cc7b7bf85e0d61375d1f4 # Parent 5ae5c863ede48e408fe75b1baa65311cff6da9b2 fixing tests + adding a test for attributes diff --git a/web.core.syntax/test/qa-functional/data/AnnTestProject/web/attributesWarnings.html b/web.core.syntax/test/qa-functional/data/AnnTestProject/web/attributesWarnings.html new file mode 100644 --- /dev/null +++ b/web.core.syntax/test/qa-functional/data/AnnTestProject/web/attributesWarnings.html @@ -0,0 +1,20 @@ + + + + + + + + + + + + + description + + diff --git a/web.core.syntax/test/qa-functional/data/AnnTestProject/web/issue127289.html b/web.core.syntax/test/qa-functional/data/AnnTestProject/web/issue127289.html --- a/web.core.syntax/test/qa-functional/data/AnnTestProject/web/issue127289.html +++ b/web.core.syntax/test/qa-functional/data/AnnTestProject/web/issue127289.html @@ -8,14 +8,14 @@ - - - + + + + + + description + + diff --git a/web.core.syntax/test/qa-functional/data/AnnTestProject/web/issue127289.html b/web.core.syntax/test/qa-functional/data/AnnTestProject/web/issue127289.html --- a/web.core.syntax/test/qa-functional/data/AnnTestProject/web/issue127289.html +++ b/web.core.syntax/test/qa-functional/data/AnnTestProject/web/issue127289.html @@ -8,14 +8,14 @@ - - - + + + + + + description + + diff --git a/web.core.syntax/test/qa-functional/data/AnnTestProject/web/issue127289.html b/web.core.syntax/test/qa-functional/data/AnnTestProject/web/issue127289.html --- a/web.core.syntax/test/qa-functional/data/AnnTestProject/web/issue127289.html +++ b/web.core.syntax/test/qa-functional/data/AnnTestProject/web/issue127289.html @@ -8,14 +8,14 @@ - - - + + + + + + description + + diff --git a/web.core.syntax/test/qa-functional/data/AnnTestProject/web/issue127289.html b/web.core.syntax/test/qa-functional/data/AnnTestProject/web/issue127289.html --- a/web.core.syntax/test/qa-functional/data/AnnTestProject/web/issue127289.html +++ b/web.core.syntax/test/qa-functional/data/AnnTestProject/web/issue127289.html @@ -8,14 +8,14 @@ - - - + + + + + + description + + diff --git a/web.core.syntax/test/qa-functional/data/AnnTestProject/web/issue127289.html b/web.core.syntax/test/qa-functional/data/AnnTestProject/web/issue127289.html --- a/web.core.syntax/test/qa-functional/data/AnnTestProject/web/issue127289.html +++ b/web.core.syntax/test/qa-functional/data/AnnTestProject/web/issue127289.html @@ -8,14 +8,14 @@ - - -