summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-10-09 08:13:53 (EDT)
committerManik Kishore2012-10-09 08:13:53 (EDT)
commit31bdd1dde0ba35c2d35c2a6ae31328e367fb79e9 (patch)
treea461b8ac7f88ebbc3c2b27d2e2cf13b5eed1c614
parente35bcdc16932381b04a44ec4f0377bd38b4d4266 (diff)
downloadorg.eclipse.stardust.ide.wst-31bdd1dde0ba35c2d35c2a6ae31328e367fb79e9.zip
org.eclipse.stardust.ide.wst-31bdd1dde0ba35c2d35c2a6ae31328e367fb79e9.tar.gz
org.eclipse.stardust.ide.wst-31bdd1dde0ba35c2d35c2a6ae31328e367fb79e9.tar.bz2
Jira-ID: CRNT-26567
License check still in Stardust build git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide.wst@59872 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--org.eclipse.stardust.ide.wst.server.tomcat/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.stardust.ide.wst.server.tomcat/src/main/org/eclipse/stardust/ide/wst/server/tomcat/IppConfigPublisher.java18
2 files changed, 13 insertions, 8 deletions
diff --git a/org.eclipse.stardust.ide.wst.server.tomcat/META-INF/MANIFEST.MF b/org.eclipse.stardust.ide.wst.server.tomcat/META-INF/MANIFEST.MF
index c2cc8dc..9850d2f 100644
--- a/org.eclipse.stardust.ide.wst.server.tomcat/META-INF/MANIFEST.MF
+++ b/org.eclipse.stardust.ide.wst.server.tomcat/META-INF/MANIFEST.MF
@@ -22,7 +22,8 @@ Require-Bundle: org.eclipse.core.resources,
org.eclipse.stardust.modeling.audittrail.ui,
org.eclipse.stardust.ide.wst.common,
org.eclipse.debug.core,
- org.eclipse.stardust.ide.wst.facet.portal
+ org.eclipse.stardust.ide.wst.facet.portal,
+ org.eclipse.stardust.modeling.common
Bundle-ClassPath: derby-integration.jar,
lib/carnot-derby.jar,
lib/catalina-6.0.18.jar
diff --git a/org.eclipse.stardust.ide.wst.server.tomcat/src/main/org/eclipse/stardust/ide/wst/server/tomcat/IppConfigPublisher.java b/org.eclipse.stardust.ide.wst.server.tomcat/src/main/org/eclipse/stardust/ide/wst/server/tomcat/IppConfigPublisher.java
index 0b17a1e..f39e20b 100644
--- a/org.eclipse.stardust.ide.wst.server.tomcat/src/main/org/eclipse/stardust/ide/wst/server/tomcat/IppConfigPublisher.java
+++ b/org.eclipse.stardust.ide.wst.server.tomcat/src/main/org/eclipse/stardust/ide/wst/server/tomcat/IppConfigPublisher.java
@@ -35,19 +35,22 @@ import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jst.server.core.IWebModule;
import org.eclipse.jst.server.tomcat.core.internal.TomcatServerBehaviour;
+import org.eclipse.ui.progress.UIJob;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.ServerPort;
+import org.eclipse.wst.server.core.TaskModel;
+import org.eclipse.wst.server.core.model.PublisherDelegate;
+
import org.eclipse.stardust.common.CompareHelper;
import org.eclipse.stardust.common.StringUtils;
import org.eclipse.stardust.common.utils.io.CloseableUtil;
+import org.eclipse.stardust.engine.api.model.Modules;
import org.eclipse.stardust.ide.wst.common.utils.FacetSetupUtils;
import org.eclipse.stardust.ide.wst.common.utils.ProjectSetupUtils;
import org.eclipse.stardust.ide.wst.facet.portal.IPPPortalBundleActivator;
+import org.eclipse.stardust.modeling.common.BpmCommonActivator;
import org.eclipse.stardust.modeling.common.platform.utils.BundleUtils;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerPort;
-import org.eclipse.wst.server.core.TaskModel;
-import org.eclipse.wst.server.core.model.PublisherDelegate;
/**
@@ -82,7 +85,8 @@ public class IppConfigPublisher extends PublisherDelegate
IProject project = webModule.getProject();
if (isIppProject(project))
{
- if (!isLicenseSetInUi())
+ Exception e = BpmCommonActivator.getDefault().initializeExtensions(Modules.DEVELOPER);
+ if (e != null && !isLicenseSetInUi())
{
new UIJob(Tomcat_Messages.TXT_INFINITY_DEPLOYMENT)
{