[286983] Fix the discrepancy of the plugins and the streams that exists between 3.1.1 and 3.2
diff --git a/features/org.eclipse.jst.server_adapters.ext.feature/feature.xml b/features/org.eclipse.jst.server_adapters.ext.feature/feature.xml index ad185f2..d8703e5 100644 --- a/features/org.eclipse.jst.server_adapters.ext.feature/feature.xml +++ b/features/org.eclipse.jst.server_adapters.ext.feature/feature.xml
@@ -2,7 +2,7 @@ <feature id="org.eclipse.jst.server_adapters.ext.feature" label="%featureName" - version="3.1.0.qualifier" + version="3.1.1.qualifier" provider-name="%providerName"> <description>
diff --git a/features/org.eclipse.jst.server_adapters.ext.sdk.feature/feature.xml b/features/org.eclipse.jst.server_adapters.ext.sdk.feature/feature.xml index 7072bcc..66b90e1 100644 --- a/features/org.eclipse.jst.server_adapters.ext.sdk.feature/feature.xml +++ b/features/org.eclipse.jst.server_adapters.ext.sdk.feature/feature.xml
@@ -2,7 +2,7 @@ <feature id="org.eclipse.jst.server_adapters.ext.sdk.feature" label="%featureName" - version="3.1.0.qualifier" + version="3.1.1.qualifier" provider-name="%providerName"> <description>
diff --git a/features/org.eclipse.jst.server_core.feature/feature.xml b/features/org.eclipse.jst.server_core.feature/feature.xml index bef6b12..7e39ed3 100644 --- a/features/org.eclipse.jst.server_core.feature/feature.xml +++ b/features/org.eclipse.jst.server_core.feature/feature.xml
@@ -2,7 +2,7 @@ <feature id="org.eclipse.jst.server_core.feature" label="%featureName" - version="3.1.0.qualifier" + version="3.1.1.qualifier" provider-name="%providerName"> <description>
diff --git a/features/org.eclipse.jst.server_ui.feature/feature.xml b/features/org.eclipse.jst.server_ui.feature/feature.xml index a0a5c99..f107504 100644 --- a/features/org.eclipse.jst.server_ui.feature/feature.xml +++ b/features/org.eclipse.jst.server_ui.feature/feature.xml
@@ -2,7 +2,7 @@ <feature id="org.eclipse.jst.server_ui.feature" label="%featureName" - version="3.1.0.qualifier" + version="3.1.1.qualifier" provider-name="%providerName"> <description>
diff --git a/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF index 42020d5..d79927e 100644 --- a/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jst.server.generic.core; singleton:=true -Bundle-Version: 1.0.505.qualifier +Bundle-Version: 1.0.506.qualifier Bundle-Activator: org.eclipse.jst.server.generic.core.internal.CorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/EarModuleAssembler.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/EarModuleAssembler.java index 94d9c60..2b8c4bd 100644 --- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/EarModuleAssembler.java +++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/publishers/EarModuleAssembler.java
@@ -37,10 +37,14 @@ super(module, server, assembleRoot); } - public IPath assemble(IProgressMonitor monitor) throws CoreException{ - //copy ear root to the temporary assembly directory - IPath parent =copyModule(fModule,monitor); - IEnterpriseApplication earModule = (IEnterpriseApplication)fModule.loadAdapter(IEnterpriseApplication.class, monitor); + public IPath assemble(IProgressMonitor monitor) throws CoreException { + // copy ear root to the temporary assembly directory + IPath parent = fAssembleRoot; + final IModule[] rootMod = { fModule }; + boolean shouldCopy = (IServer.PUBLISH_STATE_NONE != fServer.getServer().getModulePublishState(rootMod)); + if (shouldCopy) + copyModule(fModule, monitor); + IEnterpriseApplication earModule = (IEnterpriseApplication) fModule.loadAdapter(IEnterpriseApplication.class, monitor); IModule[] childModules = earModule.getModules(); for (int i = 0; i < childModules.length; i++) { IModule module = childModules[i]; @@ -69,8 +73,10 @@ * @return module changed */ private boolean shouldRepack( IModule module ) { + final IModule[] rootMod = { fModule }; final IModule[] modules ={fModule, module}; boolean repack = (IServer.PUBLISH_STATE_NONE != fServer.getServer().getModulePublishState(modules)); + repack |= (IServer.PUBLISH_STATE_NONE != fServer.getServer().getModulePublishState(rootMod)); Trace.trace(Trace.FINEST, "EarModuleAssembler should repack returns "+ Boolean.toString(repack)+ " for module "+module); //$NON-NLS-1$//$NON-NLS-2$ return repack;
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.generic.oc4j/META-INF/MANIFEST.MF index c7b2d85..d92d30b 100644 --- a/plugins/org.eclipse.jst.server.generic.oc4j/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.server.generic.oc4j/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jst.server.generic.oc4j;singleton:=true -Bundle-Version: 1.5.205.qualifier +Bundle-Version: 1.5.206.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.jst.server.generic.core;bundle-version="[1.0.102,2.0.0)",
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/plugin.properties b/plugins/org.eclipse.jst.server.generic.oc4j/plugin.properties index 9e7bc67..d4200fa 100644 --- a/plugins/org.eclipse.jst.server.generic.oc4j/plugin.properties +++ b/plugins/org.eclipse.jst.server.generic.oc4j/plugin.properties
@@ -1,10 +1,11 @@ ################################################################################################## -# Copyright (c) 2005 Eteration A.S. and Gorkem Ercan. All rights reserved. This program and the +# Copyright (c) 2005, 2009 Eteration A.S. and Gorkem Ercan in collaboration of others. All rights reserved. This program and the # accompanying materials are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html # # Contributors: Gorkem Ercan - initial API and implementation +# Angel Vera - corrections # ################################################################################################### pluginName= OC4J Generic server definitions @@ -13,8 +14,8 @@ # ============ OC4J 10.1.3 DP 4==================== -pluginName= Oracle OC4J v10.1.3 DP4 Generic Server Definition Core Plug-in -pluginDescription=Provides server definition for Oracle OC4J Standalone 10.1.3 DP4.\ +oracle.10_1_3Preview.pluginName= Oracle OC4J v10.1.3 DP4 Generic Server Definition Core Plug-in +oracle.10_1_3Preview.pluginDescription=Provides server definition for Oracle OC4J Standalone 10.1.3 DP4.\ Provides basic server functionality oracleCategory=Oracle
diff --git a/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF index f7f9f3b..29ed85f 100644 --- a/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.server.ui; singleton:=true -Bundle-Version: 1.1.102.qualifier +Bundle-Version: 1.1.103.qualifier Bundle-Activator: org.eclipse.wst.server.ui.internal.ServerUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.wst.server.ui/plugin.properties b/plugins/org.eclipse.wst.server.ui/plugin.properties index 20c8d96..6df0be9 100644 --- a/plugins/org.eclipse.wst.server.ui/plugin.properties +++ b/plugins/org.eclipse.wst.server.ui/plugin.properties
@@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2004, 2007 IBM Corporation and others. +# Copyright (c) 2004, 2009 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -17,7 +17,6 @@ extensionPointServerImages=Server Images extensionPointWizardFragments=Wizard Fragments extensionPointInitialSelectionProvider=Initial Selection Provider -extensionPointAudio=Audio # --------------- Wizards and Views ---------------
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ShowInConsoleAction.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ShowInConsoleAction.java index d9d4a03..d1ae73d 100644 --- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ShowInConsoleAction.java +++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ShowInConsoleAction.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 IBM Corporation and others. + * Copyright (c) 2007, 2009 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -46,7 +46,7 @@ } public boolean accept(IServer server) { - return (server.getServerType() != null && server.getServerState() != IServer.STATE_STOPPED); + return (server.getServerType() != null && server.getServerState() != IServer.STATE_STOPPED) && server.getLaunch() != null; } public void perform(IServer server) {
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ShowInMenuAction.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ShowInMenuAction.java index 8a6667c..d133f83 100644 --- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ShowInMenuAction.java +++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ShowInMenuAction.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others. + * Copyright (c) 2007, 2009 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -38,18 +38,15 @@ } public Menu getMenu(Control parent) { - System.out.println("creating menu1"); return getMenuManager().createContextMenu(parent); } public Menu getMenu(Menu parent) { - System.out.println("creating menu2"); //return getMenuManager().createContextMenu(parent.getShell()); return null; } private MenuManager getMenuManager() { - System.out.println("creating menu"); if (menuManager != null) return menuManager;