summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-09-03 08:55:51 (EDT)
committer Stephan Born2013-09-06 09:14:28 (EDT)
commit967bfeeae2ef79a3145cf8aa8ceef98e9abed0c7 (patch)
treec418ab0d99faf65c863bfce5c612fb650131643e
parent6679a3ae29a58daab920b513ff38bce601907461 (diff)
downloadorg.eclipse.stardust.ide.wst-967bfeeae2ef79a3145cf8aa8ceef98e9abed0c7.zip
org.eclipse.stardust.ide.wst-967bfeeae2ef79a3145cf8aa8ceef98e9abed0c7.tar.gz
org.eclipse.stardust.ide.wst-967bfeeae2ef79a3145cf8aa8ceef98e9abed0c7.tar.bz2
Jira-ID: CRNT-30395
Removed atmosphere dependency from IPP build and ui-web/web-modeler/ *.js,*.xhtml git-svn-id: https://svn.csa.sungard.com/repos/ipp2/product/trunk/stardust/ide.wst@67072 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b Signed-off-by: Sidharth Singh <sidharth.singh@sungard.com>
-rw-r--r--org.eclipse.stardust.ide.wst.facet.portal/ivy.xml2
-rw-r--r--org.eclipse.stardust.ide.wst.facet.portal/pom.xml4
-rw-r--r--org.eclipse.stardust.ide.wst.facet.portal/src/org/eclipse/stardust/ide/wst/facet/portal/IPPPortalFacet.java24
-rw-r--r--org.eclipse.stardust.ide.wst.facet.portal/src/org/eclipse/stardust/ide/wst/facet/portal/InstallDelegate.java6
-rw-r--r--org.eclipse.stardust.ide.wst.facet.portal/src/org/eclipse/stardust/ide/wst/facet/portal/UninstallDelegate.java9
5 files changed, 18 insertions, 27 deletions
diff --git a/org.eclipse.stardust.ide.wst.facet.portal/ivy.xml b/org.eclipse.stardust.ide.wst.facet.portal/ivy.xml
index b86d83d..dad2e55 100644
--- a/org.eclipse.stardust.ide.wst.facet.portal/ivy.xml
+++ b/org.eclipse.stardust.ide.wst.facet.portal/ivy.xml
@@ -80,7 +80,7 @@
<dependency org="com.sun.media" name="jai_imageio" rev="${jai_imageio.version}" transitive="false" conf="bom->default" />
<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.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 e609c9c..d7c282d 100644
--- a/org.eclipse.stardust.ide.wst.facet.portal/pom.xml
+++ b/org.eclipse.stardust.ide.wst.facet.portal/pom.xml
@@ -609,6 +609,7 @@
</exclusions>
</dependency>
+
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.common</artifactId>
@@ -743,8 +744,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,icepdf-core,jcr,jencks,jstl,myfaces-impl,tranql-connector,
- jsr311-api,
- org.eclipse.emf.common,org.eclipse.emf.ecore,org.eclipse.emf.ecore.xmi,org.eclipse.emf.ecore.change,org.eclipse.xsd,
+ 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>
</configuration>
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 2d44892..6cc1391 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
@@ -28,13 +28,13 @@ public class IPPPortalFacet
{
/* Extension point ID */
public static final String ICEFACES_JAR_REPLACEMENT = "org.eclipse.stardust.ide.wst.facet.portal.icefacesJarReplacement"; //$NON-NLS-1$
-
+
public static final String PORTAL_ROOT = "ipp-portal"; //$NON-NLS-1$
public static ExternalLibrary[] getDeprecatedLibraries()
{
List<ExternalLibrary> result = new ArrayList<ExternalLibrary>();
-
+
result.add(portalLib("carnot-dms.jar")); //$NON-NLS-1$
result.add(portalLib("carnot-processportal.jar")); //$NON-NLS-1$
@@ -46,12 +46,12 @@ public class IPPPortalFacet
result.add(portalLib("carnot-hibernate.jar")); //$NON-NLS-1$
result.add(portalLib("dom4j-1.6.1.jar")); //$NON-NLS-1$
result.add(portalLib("hibernate3.jar")); //$NON-NLS-1$
-
+
result.add(portalLib("spring.jar")); //$NON-NLS-1$
-
+
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$
@@ -80,11 +80,11 @@ public class IPPPortalFacet
result.add(springLib("spring-orm.jar")); //$NON-NLS-1$
result.add(springLib("spring-tx.jar")); //$NON-NLS-1$
result.add(springLib("spring-web.jar")); //$NON-NLS-1$
- result.add(springLib("spring-webmvc.jar")); //$NON-NLS-1$
-
+ result.add(springLib("spring-webmvc.jar")); //$NON-NLS-1$
+
return result.toArray(new ExternalLibrary[0]);
}
-
+
public static ExternalLibrary[] getExternalLibraries()
{
List<ExternalLibrary> result = new ArrayList<ExternalLibrary>();
@@ -149,7 +149,7 @@ public class IPPPortalFacet
// custom jai_imageio.jar
result.add(portalLib("jai_imageio.jar")); //$NON-NLS-1$
-
+
// web modeler
result.add(portalLib("ipp-bpm-model-builder.jar")); //$NON-NLS-1$
result.add(portalLib("stardust-web-modeler.jar")); //$NON-NLS-1$
@@ -165,7 +165,7 @@ public class IPPPortalFacet
result.add(portalLib("org.eclipse.emf.ecore.change.jar")); //$NON-NLS-1$
result.add(portalLib("org.eclipse.emf.ecore.xmi.jar")); //$NON-NLS-1$
result.add(portalLib("org.eclipse.xsd.jar")); //$NON-NLS-1$
-
+
// web modeler eclipse plugin dependencies
result.add(portalLib("org.eclipse.core.runtime.jar")); //$NON-NLS-1$
result.add(portalLib("org.eclipse.equinox.common.jar")); //$NON-NLS-1$
@@ -204,12 +204,12 @@ public class IPPPortalFacet
{
return CommonLibraryUtils.resolveEngineBaseLibrary(jarBaseName);
}
-
+
private static ExternalLibrary engineLib(String jarBaseName)
{
return CommonLibraryUtils.resolveEngineLibrary(jarBaseName);
}
-
+
private static ExternalLibrary j2eeLib(String jarBaseName)
{
return CommonLibraryUtils.resolveJ2eeLibrary(jarBaseName);
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 16c7e49..495914a 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
@@ -366,8 +366,8 @@ public class InstallDelegate extends AbstractDelegate implements IModuleConfigur
WebXmlUtils.addServletParam(jaxRsServlet, "disable-address-updates", "true");
WebXmlUtils.addServletMapping(root, jaxRsServlet, "/services/rest/*"); //$NON-NLS-1$
-
-
+
+
// Add spring related settings
WebXmlUtils.addListener(root,
"org.springframework.web.context.ContextLoaderListener"); //$NON-NLS-1$
@@ -430,7 +430,7 @@ public class InstallDelegate extends AbstractDelegate implements IModuleConfigur
"org.eclipse.stardust.ui.web.html5.HTML5LandingPageFilter"); //$NON-NLS-1$
WebXmlUtils.addFilterMapping(root, portalFilter, "/main.html", //$NON-NLS-1$
new String[] { "REQUEST" , "FORWARD" }); //$NON-NLS-1$
-
+
portalFilter = WebXmlUtils.addFilter(root, "Jar Resource Filter", //$NON-NLS-1$
"org.eclipse.stardust.ui.web.html5.EnhancedJarResourceFilter"); //$NON-NLS-1$
WebXmlUtils.addFilterParam(root, portalFilter, "replacePattern", "/main.html"); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/org.eclipse.stardust.ide.wst.facet.portal/src/org/eclipse/stardust/ide/wst/facet/portal/UninstallDelegate.java b/org.eclipse.stardust.ide.wst.facet.portal/src/org/eclipse/stardust/ide/wst/facet/portal/UninstallDelegate.java
index a261cee..c900c55 100644
--- a/org.eclipse.stardust.ide.wst.facet.portal/src/org/eclipse/stardust/ide/wst/facet/portal/UninstallDelegate.java
+++ b/org.eclipse.stardust.ide.wst.facet.portal/src/org/eclipse/stardust/ide/wst/facet/portal/UninstallDelegate.java
@@ -628,15 +628,6 @@ public class UninstallDelegate extends AbstractDelegate implements IModuleConfig
WebXmlUtils.removeServlet(root, ippUploadServlet);
}
- Servlet atmosphereMeteorServlet = WebXmlUtils.findServlet(root,
- "Atmosphere - Meteor Servlet", //$NON-NLS-1$
- "org.atmosphere.cpr.MeteorServlet"); //$NON-NLS-1$
- if (null != atmosphereMeteorServlet)
- {
- WebXmlUtils.removeServletMapping(root, atmosphereMeteorServlet, "/services/streaming/*"); //$NON-NLS-1$
- WebXmlUtils.removeServlet(root, atmosphereMeteorServlet);
- }
-
// Remove pre-Stardust version of the filter
Filter charsetFilter = WebXmlUtils.findFilter(root, "IppPortalCharsetFilter", //$NON-NLS-1$
"com.infinity.bpm.ui.web.viewscommon.common.CharsetFilter"); //$NON-NLS-1$