[513578] Update JBoss Tools / EAP / Wildfly server adapter discovery for Oxygen

Signed-off-by: nickb <nboldt@redhat.com>
diff --git a/plugins/org.eclipse.wst.server.discovery/serverAdapterSites.xml b/plugins/org.eclipse.wst.server.discovery/serverAdapterSites.xml
index c98e140..99c82bd 100644
--- a/plugins/org.eclipse.wst.server.discovery/serverAdapterSites.xml
+++ b/plugins/org.eclipse.wst.server.discovery/serverAdapterSites.xml
@@ -5,7 +5,7 @@
    <site url="http://jope.ow2.org/update/jope/"/>
    <site url="http://download.eclipse.org/jetty/updates/jetty-wtp/"/>
    <site url="http://www.caucho.com/eclipse/"/>   
-   <site url="http://download.jboss.org/jbosstools/updates/webtools/neon/"/>
+   <site url="http://download.jboss.org/jbosstools/updates/webtools/oxygen/"/>
    <site url="http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/updates/libertyAdapter/neon/"/>
    <site url="http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/updates/bluemixAdapter/neon/"/>
    <site url="http://download.oracle.com/otn_software/oepe/oxygen/"/>
diff --git a/plugins/org.eclipse.wst.server.discovery/serverAdapterSitesDetails.xml b/plugins/org.eclipse.wst.server.discovery/serverAdapterSitesDetails.xml
index 86e1a97..b8a4403 100644
--- a/plugins/org.eclipse.wst.server.discovery/serverAdapterSitesDetails.xml
+++ b/plugins/org.eclipse.wst.server.discovery/serverAdapterSitesDetails.xml
@@ -79,11 +79,11 @@
 		runtime-vendor="Resin" runtimeId="org.eclipse.jst.server.generic.runtime.resin40">

 	</feature>

 	<feature

-		uri="http://download.jboss.org/jbosstools/updates/webtools/neon/"

+		uri="http://download.jboss.org/jbosstools/updates/webtools/oxygen/"

 		id="org.jboss.ide.eclipse.as.feature.feature.group"

 		name="JBoss AS, WildFly, &amp; EAP Server Tools"

 		description="Provides WTP server adapters for JBoss installations. These adapters are capable of deployment and providing classpaths for projects. Zipped or exploded deployments, JMX integration, and other extensions are included."

-		provider="Red Hat JBoss Middleware" version="3.1.0.Beta2-v20150723-0026-B29" serverId="org.jboss.ide.eclipse.as.eap.70"

+		provider="Red Hat JBoss Middleware" version="3.3.0" serverId="org.jboss.ide.eclipse.as.eap.70"

 		runtime-vendor="Red Hat JBoss Middleware" runtimeId="org.jboss.ide.eclipse.as.runtime.eap.70">

 	</feature>

 	<feature uri="http://download.oracle.com/otn_software/oepe/oxygen/"