Permalink
Browse files

Sync 3.4.2 GA code to R3_4_maintenance stream

  • Loading branch information...
1 parent 8de49a6 commit a6342a7debf8c7db1d129433ad0f5162691a61ef @elsony elsony committed Mar 19, 2013
Showing with 252 additions and 124 deletions.
  1. +31 −30 features/org.eclipse.jst.server_adapters.sdk.feature/feature.xml
  2. +2 −2 features/org.eclipse.wst.server_adapters.feature/feature.xml
  3. +1 −1 features/org.eclipse.wst.server_adapters.sdk.feature/feature.xml
  4. +1 −1 features/org.eclipse.wst.server_core.feature/feature.xml
  5. +1 −1 features/org.eclipse.wst.server_sdk.feature/feature.xml
  6. +1 −1 features/org.eclipse.wst.server_ui.feature/feature.xml
  7. +1 −0 plugins/org.eclipse.jst.server.generic.jboss/build.properties
  8. +1 −0 plugins/org.eclipse.jst.server.generic.jonas/build.properties
  9. +1 −0 plugins/org.eclipse.jst.server.generic.oc4j/build.properties
  10. +1 −1 plugins/org.eclipse.wst.server.core/META-INF/MANIFEST.MF
  11. +121 −68 plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java
  12. +1 −1 ...rg.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerWorkingCopy.java
  13. +46 −1 ...eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ServerBehaviourDelegate.java
  14. +28 −7 plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/PublishHelper.java
  15. +1 −1 plugins/org.eclipse.wst.server.preview.adapter/META-INF/MANIFEST.MF
  16. +3 −3 .../src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java
  17. +1 −1 plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF
  18. +1 −0 plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Timer.java
  19. +1 −1 ...wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/ModifyModulesComposite.java
  20. +4 −0 ...t.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java
  21. +4 −4 ...pse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewServerComposite.java
@@ -1,30 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.server_adapters.sdk.feature"
- label="%featureName"
- version="3.3.101.qualifier"
- provider-name="%providerName"
- license-feature="org.eclipse.license"
- license-feature-version="1.0.0.qualifier">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <includes
- id="org.eclipse.jst.server_adapters.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.server_adapters.feature.source"
- version="0.0.0"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.jst.server_adapters.sdk.feature"
+ label="%featureName"
+ version="3.3.101.qualifier"
+ provider-name="%providerName"
+ license-feature="org.eclipse.license"
+ license-feature-version="1.0.0.qualifier">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+
+ <includes
+ id="org.eclipse.jst.server_adapters.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.jst.server_adapters.feature.source"
+ version="0.0.0"/>
+
+</feature>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_adapters.feature"
label="%featureName"
- version="3.2.202.qualifier"
+ version="3.2.203.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.0.qualifier">
@@ -59,6 +59,6 @@
download-size="0"
install-size="0"
version="8.1.3.qualifier"
- unpack="false"/>
+ unpack="false"/>
</feature>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_adapters.sdk.feature"
label="%featureName"
- version="3.2.102.qualifier"
+ version="3.2.104.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.0.qualifier">
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_core.feature"
label="%featureName"
- version="3.3.100.qualifier"
+ version="3.3.200.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.0.qualifier">
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_sdk.feature"
label="%featureName"
- version="3.3.101.qualifier"
+ version="3.3.201.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.0.qualifier">
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_ui.feature"
label="%featureName"
- version="3.3.101.qualifier"
+ version="3.3.201.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.0.qualifier">
@@ -15,5 +15,6 @@ bin.includes = META-INF/,\
icons/,\
buildfiles/,\
genericjboss.jar
+src.includes = build.properties
source.genericjboss.jar = servers/
jars.compile.order = genericjboss.jar
@@ -15,5 +15,6 @@ bin.includes = META-INF/,\
servers/,\
buildfiles/,\
genericjonas.jar
+src.includes = build.properties
jars.compile.order = genericjonas.jar
source.genericjonas.jar = servers/
@@ -15,5 +15,6 @@ bin.includes = META-INF/,\
plugin.properties,\
servers/,\
genericoc4j.jar
+src.includes = build.properties
source.genericoc4j.jar = servers/
jars.compile.order = genericoc4j.jar
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.server.core; singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.100.qualifier
Bundle-Activator: org.eclipse.wst.server.core.internal.ServerPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Oops, something went wrong.

0 comments on commit a6342a7

Please sign in to comment.