diff --git a/maven/nbproject/project.xml b/maven/nbproject/project.xml
--- a/maven/nbproject/project.xml
+++ b/maven/nbproject/project.xml
@@ -210,6 +210,14 @@
+ org.netbeans.modules.options.java
+
+
+
+ 1.0
+
+
+
org.netbeans.modules.project.ant
diff --git a/maven/src/org/netbeans/modules/maven/execute/AbstractMavenExecutor.java b/maven/src/org/netbeans/modules/maven/execute/AbstractMavenExecutor.java
--- a/maven/src/org/netbeans/modules/maven/execute/AbstractMavenExecutor.java
+++ b/maven/src/org/netbeans/modules/maven/execute/AbstractMavenExecutor.java
@@ -70,6 +70,7 @@
import static org.netbeans.modules.maven.execute.Bundle.*;
import org.netbeans.modules.maven.execute.ui.RunGoalsPanel;
import org.netbeans.modules.maven.options.MavenOptionController;
+import org.netbeans.modules.options.java.api.JavaOptions;
import org.netbeans.spi.project.ui.support.BuildExecutionSupport;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
@@ -423,7 +424,7 @@
}
@Override public void actionPerformed(ActionEvent e) {
- OptionsDisplayer.getDefault().open(OptionsDisplayer.ADVANCED + "/" + MavenOptionController.OPTIONS_SUBPATH);
+ OptionsDisplayer.getDefault().open(JavaOptions.JAVA + "/" + MavenOptionController.OPTIONS_SUBPATH);
}
}
diff --git a/maven/src/org/netbeans/modules/maven/newproject/BasicPanelVisual.java b/maven/src/org/netbeans/modules/maven/newproject/BasicPanelVisual.java
--- a/maven/src/org/netbeans/modules/maven/newproject/BasicPanelVisual.java
+++ b/maven/src/org/netbeans/modules/maven/newproject/BasicPanelVisual.java
@@ -82,6 +82,7 @@
import static org.netbeans.modules.maven.newproject.Bundle.*;
import org.netbeans.modules.maven.options.MavenOptionController;
import org.netbeans.modules.maven.options.MavenSettings;
+import org.netbeans.modules.options.java.api.JavaOptions;
import org.netbeans.spi.project.ui.support.ProjectChooser;
import org.netbeans.validation.api.AbstractValidator;
import org.netbeans.validation.api.Problems;
@@ -444,7 +445,7 @@
}//GEN-LAST:event_browseButtonActionPerformed
private void btnSetupNewerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSetupNewerActionPerformed
- OptionsDisplayer.getDefault().open(OptionsDisplayer.ADVANCED + "/" + MavenOptionController.OPTIONS_SUBPATH); //NOI18N
+ OptionsDisplayer.getDefault().open(JavaOptions.JAVA + "/" + MavenOptionController.OPTIONS_SUBPATH); //NOI18N
panel.getValidationGroup().performValidation();
}//GEN-LAST:event_btnSetupNewerActionPerformed
diff --git a/maven/src/org/netbeans/modules/maven/output/GlobalOutputProcessor.java b/maven/src/org/netbeans/modules/maven/output/GlobalOutputProcessor.java
--- a/maven/src/org/netbeans/modules/maven/output/GlobalOutputProcessor.java
+++ b/maven/src/org/netbeans/modules/maven/output/GlobalOutputProcessor.java
@@ -55,6 +55,7 @@
import org.netbeans.modules.maven.api.output.OutputVisitor;
import org.netbeans.modules.maven.options.MavenOptionController;
import static org.netbeans.modules.maven.output.Bundle.*;
+import org.netbeans.modules.options.java.api.JavaOptions;
import org.openide.awt.HtmlBrowser.URLDisplayer;
import org.openide.cookies.LineCookie;
import org.openide.filesystems.FileObject;
@@ -112,7 +113,7 @@
visitor.setOutputListener(new OutputListener() {
@Override public void outputLineSelected(OutputEvent ev) {}
@Override public void outputLineAction(OutputEvent ev) {
- OptionsDisplayer.getDefault().open(OptionsDisplayer.ADVANCED + "/" + MavenOptionController.OPTIONS_SUBPATH); //NOI18N
+ OptionsDisplayer.getDefault().open(JavaOptions.JAVA + "/" + MavenOptionController.OPTIONS_SUBPATH); //NOI18N
}
@Override public void outputLineCleared(OutputEvent ev) {}
});
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -522,6 +522,7 @@
maven.spring,\
o.apache.tools.ant.module,\
o.jdesktop.beansbinding,\
+ options.java,\
projectimport.eclipse.core,\
projectimport.eclipse.j2se,\
refactoring.java,\
diff --git a/options.java/build.xml b/options.java/build.xml
new file mode 100644
--- /dev/null
+++ b/options.java/build.xml
@@ -0,0 +1,5 @@
+
+
+ Builds, tests, and runs the project org.netbeans.modules.options.java
+
+
diff --git a/options.java/manifest.mf b/options.java/manifest.mf
new file mode 100644
--- /dev/null
+++ b/options.java/manifest.mf
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: false
+OpenIDE-Module: org.netbeans.modules.options.java
+OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/options/java/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.0
+
diff --git a/options.java/nbproject/project.properties b/options.java/nbproject/project.properties
new file mode 100644
--- /dev/null
+++ b/options.java/nbproject/project.properties
@@ -0,0 +1,2 @@
+javac.source=1.6
+javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/options.java/nbproject/project.xml b/options.java/nbproject/project.xml
new file mode 100644
--- /dev/null
+++ b/options.java/nbproject/project.xml
@@ -0,0 +1,38 @@
+
+
+ org.netbeans.modules.apisupport.project
+
+
+ org.netbeans.modules.options.java
+
+
+ org.netbeans.modules.options.api
+
+
+
+ 1
+ 1.25
+
+
+
+ org.openide.util
+
+
+
+ 8.22
+
+
+
+
+ org.apache.tools.ant.module
+ org.netbeans.modules.debugger.jpda.ui
+ org.netbeans.modules.form
+ org.netbeans.modules.javacard.project
+ org.netbeans.modules.maven
+ org.netbeans.modules.profiler.options
+ org.netbeans.modules.vmd.componentssupport
+ org.netbeans.modules.options.java.api
+
+
+
+
diff --git a/options.java/src/org/netbeans/modules/options/java/Bundle.properties b/options.java/src/org/netbeans/modules/options/java/Bundle.properties
new file mode 100644
--- /dev/null
+++ b/options.java/src/org/netbeans/modules/options/java/Bundle.properties
@@ -0,0 +1,5 @@
+OpenIDE-Module-Display-Category=Java
+OpenIDE-Module-Long-Description=\
+ Provides Tools | Options dialog Java primary panel and allows secondary panels to be registered.
+OpenIDE-Module-Name=Java Options
+OpenIDE-Module-Short-Description=Provides the Java primary panel in the Options dialog.
diff --git a/options.java/src/org/netbeans/modules/options/java/api/JavaOptions.java b/options.java/src/org/netbeans/modules/options/java/api/JavaOptions.java
new file mode 100644
--- /dev/null
+++ b/options.java/src/org/netbeans/modules/options/java/api/JavaOptions.java
@@ -0,0 +1,53 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle 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 2012 Sun Microsystems, Inc.
+ */
+package org.netbeans.modules.options.java.api;
+
+/**
+ *
+ * @author theofanis
+ */
+public final class JavaOptions {
+ /** Registration name of Java category.
+ * @since 1.0
+ */
+ public static final String JAVA = "Java"; // NOI18N
+}
diff --git a/java.kit/src/org/netbeans/modules/java/options/java_logo.png b/options.java/src/org/netbeans/modules/options/java/resources/java_logo.png
rename from java.kit/src/org/netbeans/modules/java/options/java_logo.png
rename to options.java/src/org/netbeans/modules/options/java/resources/java_logo.png
diff --git a/java.kit/src/org/netbeans/modules/java/options/package-info.java b/options.java/src/org/netbeans/modules/options/java/resources/package-info.java
rename from java.kit/src/org/netbeans/modules/java/options/package-info.java
rename to options.java/src/org/netbeans/modules/options/java/resources/package-info.java
--- a/java.kit/src/org/netbeans/modules/java/options/package-info.java
+++ b/options.java/src/org/netbeans/modules/options/java/resources/package-info.java
@@ -39,11 +39,11 @@
id = "Java",
position = 610, //Keymap Container is at position 600 and PHP Container is at position 650
categoryName = "#OptionsCategory_Name_Java",
- iconBase = "org/netbeans/modules/java/options/java_logo.png",
+ iconBase = "org/netbeans/modules/options/java/resources/java_logo.png",
keywords = "#OptionsCategory_Keywords_Java",
keywordsCategory = "Java")
@Messages({"OptionsCategory_Keywords_Java=Java Options","OptionsCategory_Name_Java=Java"})
-package org.netbeans.modules.java.options;
+package org.netbeans.modules.options.java.resources;
import org.netbeans.spi.options.OptionsPanelController;
import org.openide.util.NbBundle.Messages;