[373136] Always separate the Java Output Folder from the Java Source Folder
diff --git a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF index 7469d0b..6eb3c3c 100644 --- a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.j2ee; singleton:=true -Bundle-Version: 1.1.503.qualifier +Bundle-Version: 1.1.504.qualifier Bundle-Activator: org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java index daaf38f..c39f34e 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java
@@ -323,8 +323,6 @@ * This will be made private once the deprecated J2EEPreferences class is deleted */ static String getAppClientDefaultOutputFolderName(){ - if (ProductManager.shouldUseSingleRootStructure()) - return getDefaultString(Keys.APP_CLIENT_CONTENT_FOLDER); return getDefaultOutputFolderName(); } @@ -333,8 +331,6 @@ * This will be made private once the deprecated J2EEPreferences class is deleted */ static String getEJBDefaultOutputFolderName(){ - if (ProductManager.shouldUseSingleRootStructure()) - return getDefaultString(Keys.EJB_CONTENT_FOLDER); return getDefaultOutputFolderName(); } @@ -343,8 +339,6 @@ * This will be made private once the deprecated J2EEPreferences class is deleted */ static String getJCADefaultOutputFolderName(){ - if (ProductManager.shouldUseSingleRootStructure()) - return getDefaultString(Keys.JCA_CONTENT_FOLDER); return getDefaultOutputFolderName(); } @@ -363,8 +357,6 @@ * This will be made private once the deprecated J2EEPreferences class is deleted */ static String getDefaultOutputFolderName(){ - if (ProductManager.shouldUseSingleRootStructure()) - return getDefaultJavaSrcFolder(); String outputFolder = getProductProperty( "defaultJavaOutputFolder" ); //$NON-NLS-1$ if( outputFolder == null ){ outputFolder = getProductProperty( "outputFolder" ); //$NON-NLS-1$