summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntje Fuhrmann2013-04-29 03:10:12 (EDT)
committerStephan Born2013-04-29 07:45:47 (EDT)
commitde69ba28fe30aa9d78a00e7d39a118d302f1c9d3 (patch)
treebe45a955362840ee6e3b0395887314c43f641d57
parent99c8b07a439b3898286e3e6d7b24aa769dabada0 (diff)
downloadorg.eclipse.stardust.ide.wst-de69ba28fe30aa9d78a00e7d39a118d302f1c9d3.zip
org.eclipse.stardust.ide.wst-de69ba28fe30aa9d78a00e7d39a118d302f1c9d3.tar.gz
org.eclipse.stardust.ide.wst-de69ba28fe30aa9d78a00e7d39a118d302f1c9d3.tar.bz2
CRNT-28701: BugZilla import [405694]: Remove atmosphere* usage for Stardust Kepler build
-rw-r--r--org.eclipse.stardust.ide.wst.facet.portal/ivy.xml5
-rw-r--r--org.eclipse.stardust.ide.wst.facet.portal/pom.xml23
-rw-r--r--org.eclipse.stardust.ide.wst.facet.portal/src/org/eclipse/stardust/ide/wst/facet/portal/IPPPortalFacet.java11
-rw-r--r--org.eclipse.stardust.ide.wst.facet.portal/src/org/eclipse/stardust/ide/wst/facet/portal/InstallDelegate.java9
4 files changed, 6 insertions, 42 deletions
diff --git a/org.eclipse.stardust.ide.wst.facet.portal/ivy.xml b/org.eclipse.stardust.ide.wst.facet.portal/ivy.xml
index d760c27..40e1166 100644
--- a/org.eclipse.stardust.ide.wst.facet.portal/ivy.xml
+++ b/org.eclipse.stardust.ide.wst.facet.portal/ivy.xml
@@ -80,11 +80,6 @@
<dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}" transitive="false" conf="bom->default" />
<dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j-log4j12.version}" transitive="false" conf="bom->default" />
- <dependency org="org.atmosphere" name="atmosphere-runtime" rev="${atmosphere-runtime.version}" transitive="false" conf="bom->default" />
- <dependency org="org.atmosphere" name="atmosphere-compat-tomcat" rev="${atmosphere-compat-tomcat.version}" transitive="false" conf="bom->default" />
- <dependency org="org.atmosphere" name="atmosphere-compat-tomcat7" rev="${atmosphere-compat-tomcat7.version}" transitive="false" conf="bom->default" />
- <dependency org="org.atmosphere" name="atmosphere-compat-jbossweb" rev="${atmosphere-compat-jbossweb.version}" transitive="false" conf="bom->default" />
-
<dependency org="org.eclipse.stardust.modeling.model" name="ipp-bpm-model" rev="${ipp.version.full}" transitive="false" conf="bom->ipp-bpm-model-runtime" />
<dependency org="org.eclipse.stardust.modeling.core" name="ipp-bpm-model-validation" rev="${ipp.version.full}" transitive="false" conf="bom->ipp-bpm-model-validation-runtime" />
<dependency org="org.eclipse.stardust.modeling.core" name="ipp-bpm-repository" rev="${ipp.version.full}" transitive="false" conf="bom->ipp-bpm-repository-runtime" />
diff --git a/org.eclipse.stardust.ide.wst.facet.portal/pom.xml b/org.eclipse.stardust.ide.wst.facet.portal/pom.xml
index abeb087..1a2f15c 100644
--- a/org.eclipse.stardust.ide.wst.facet.portal/pom.xml
+++ b/org.eclipse.stardust.ide.wst.facet.portal/pom.xml
@@ -600,27 +600,6 @@
</dependency>
<dependency>
- <groupId>org.atmosphere</groupId>
- <artifactId>atmosphere-runtime</artifactId>
- <version>${atmosphere-runtime.version}</version>
- </dependency>
- <dependency>
- <groupId>org.atmosphere</groupId>
- <artifactId>atmosphere-compat-tomcat</artifactId>
- <version>${atmosphere-compat-tomcat.version}</version>
- </dependency>
- <dependency>
- <groupId>org.atmosphere</groupId>
- <artifactId>atmosphere-compat-tomcat7</artifactId>
- <version>${atmosphere-compat-tomcat7.version}</version>
- </dependency>
- <dependency>
- <groupId>org.atmosphere</groupId>
- <artifactId>atmosphere-compat-jbossweb</artifactId>
- <version>${atmosphere-compat-jbossweb.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.common</artifactId>
<version>${org.eclipse.emf.common.version}</version>
@@ -754,7 +733,7 @@
commons-codec,commons-collections,commons-digester,commons-el,commons-fileupload,
commons-jxpath,commons-lang,geronimo-connector,geronimo-j2ee-connector_1.5_spec,geronimo-jta_1.1_spec,geronimo-transaction,
htmlcleaner,icefaces-facelets,icepdf-core,jcr,jcr-vfs,jencks,jstl,myfaces-impl,tranql-connector,
- jsr311-api,atmosphere-runtime,atmosphere-compat-tomcat,atmosphere-compat-tomcat7,atmosphere-compat-jbossweb,
+ jsr311-api,
org.eclipse.emf.common,org.eclipse.emf.ecore,org.eclipse.emf.ecore.xmi,org.eclipse.emf.ecore.change,org.eclipse.xsd,
org.eclipse.osgi,org.eclipse.core.runtime,org.eclipse.equinox.common,org.eclipse.equinox.registry
</includeArtifactIds>
diff --git a/org.eclipse.stardust.ide.wst.facet.portal/src/org/eclipse/stardust/ide/wst/facet/portal/IPPPortalFacet.java b/org.eclipse.stardust.ide.wst.facet.portal/src/org/eclipse/stardust/ide/wst/facet/portal/IPPPortalFacet.java
index 1d24846..b9057b7 100644
--- a/org.eclipse.stardust.ide.wst.facet.portal/src/org/eclipse/stardust/ide/wst/facet/portal/IPPPortalFacet.java
+++ b/org.eclipse.stardust.ide.wst.facet.portal/src/org/eclipse/stardust/ide/wst/facet/portal/IPPPortalFacet.java
@@ -52,6 +52,11 @@ public class IPPPortalFacet
result.add(portalLib("trinidad-api.jar")); //$NON-NLS-1$
result.add(portalLib("trinidad-impl.jar")); //$NON-NLS-1$
+ result.add(portalLib("atmosphere-compat-jbossweb-1.0.4.jar")); //$NON-NLS-1$
+ result.add(portalLib("atmosphere-compat-tomcat-1.0.4.jar")); //$NON-NLS-1$
+ result.add(portalLib("atmosphere-compat-tomcat7-1.0.4.jar")); //$NON-NLS-1$
+ result.add(portalLib("atmosphere-runtime-1.0.4.jar")); //$NON-NLS-1$
+
result.add(j2eeLib("jms.jar")); //$NON-NLS-1$
result.add(j2eeLib("ejb.jar")); //$NON-NLS-1$
@@ -166,12 +171,6 @@ public class IPPPortalFacet
result.add(portalLib("org.eclipse.equinox.registry.jar")); //$NON-NLS-1$
result.add(portalLib("org.eclipse.osgi.jar")); //$NON-NLS-1$
- // web modeler chat
- result.add(portalLib("atmosphere-compat-jbossweb.jar")); //$NON-NLS-1$
- result.add(portalLib("atmosphere-compat-tomcat.jar")); //$NON-NLS-1$
- result.add(portalLib("atmosphere-compat-tomcat7.jar")); //$NON-NLS-1$
- result.add(portalLib("atmosphere-runtime.jar")); //$NON-NLS-1$
-
return result.toArray(new ExternalLibrary[0]);
}
diff --git a/org.eclipse.stardust.ide.wst.facet.portal/src/org/eclipse/stardust/ide/wst/facet/portal/InstallDelegate.java b/org.eclipse.stardust.ide.wst.facet.portal/src/org/eclipse/stardust/ide/wst/facet/portal/InstallDelegate.java
index 169a394..55de8a6 100644
--- a/org.eclipse.stardust.ide.wst.facet.portal/src/org/eclipse/stardust/ide/wst/facet/portal/InstallDelegate.java
+++ b/org.eclipse.stardust.ide.wst.facet.portal/src/org/eclipse/stardust/ide/wst/facet/portal/InstallDelegate.java
@@ -390,15 +390,6 @@ public class InstallDelegate extends AbstractDelegate implements IModuleConfigur
"com.icesoft.faces.component.inputfile.FileUploadServlet", 1); //$NON-NLS-1$
WebXmlUtils.addServletMapping(root, ippUploadServlet, "/uploadHtml"); //$NON-NLS-1$
- Servlet atmosphereMeteorServlet = WebXmlUtils.addServlet(root, "Atmosphere - Meteor Servlet", //$NON-NLS-1$
- "org.atmosphere.cpr.MeteorServlet", 1); //$NON-NLS-1$
- WebXmlUtils.addServletParamValue(atmosphereMeteorServlet, "org.atmosphere.servlet", //$NON-NLS-1$
- "org.springframework.web.servlet.DispatcherServlet"); //$NON-NLS-1$
- WebXmlUtils.addServletParamValue(atmosphereMeteorServlet, "contextConfigLocation", //$NON-NLS-1$
- "classpath:META-INF/spring/streaming/*-context.xml"); //$NON-NLS-1$
- WebXmlUtils.addServletMapping(root, atmosphereMeteorServlet, "/services/streaming/*"); //$NON-NLS-1$
-
-
Filter contentFilter = WebXmlUtils.addFilter(root, "portalPluginContentFilter", //$NON-NLS-1$
"org.eclipse.stardust.ui.web.plugin.support.PortalPluginContentFilter"); //$NON-NLS-1$
WebXmlUtils.addFilterMapping(root, contentFilter, "/plugins/*"); //$NON-NLS-1$