Author: bbrodt Date: 2010-11-11 12:10:14 -0500 (Thu, 11 Nov 2010) New Revision: 26459 Removed: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/GenericBPELPublisher.java Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/definition/ode.xml trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdeBPELPublisher.java Log: OPEN - issue JBIDE-6588: BPEL deployment to ODE running in Tomcat https://jira.jboss.org/browse/JBIDE-6588 Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF 2010-11-11 16:43:18 UTC (rev 26458) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF 2010-11-11 17:10:14 UTC (rev 26459) @@ -14,7 +14,7 @@ org.eclipse.bpel.model;bundle-version="0.5.0", org.eclipse.jem.util;bundle-version="[2.0.100,3.0.0)", org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.jboss.tools.bpel.runtimes;bundle-version="0.4.0", + org.eclipse.bpel.runtimes;bundle-version="0.5.0", org.eclipse.jst.server.generic.ui;bundle-version="[1.0.305,2.0.0)", org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)", org.eclipse.bpel.ui;bundle-version="0.5.0", Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/definition/ode.xml =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/definition/ode.xml 2010-11-11 16:43:18 UTC (rev 26458) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/definition/ode.xml 2010-11-11 17:10:14 UTC (rev 26459) @@ -28,7 +28,7 @@ </port> <module> - <type>jbt.bpel.module</type> + <type>bpel.module</type> <publishDir>${ode.home}/WEB-INF/processes</publishDir> <publisherReference>org.eclipse.bpel.apache.ode.runtime.publisher</publisherReference> </module> Deleted: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/GenericBPELPublisher.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/GenericBPELPublisher.java 2010-11-11 16:43:18 UTC (rev 26458) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/GenericBPELPublisher.java 2010-11-11 17:10:14 UTC (rev 26459) @@ -1,135 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 University College London Software Systems Engineering - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Bruno Wassermann - initial API and implementation - *******************************************************************************/ -package org.eclipse.bpel.apache.ode.runtime; - -import java.util.Iterator; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jst.server.generic.core.internal.GenericPublisher; -import org.eclipse.jst.server.generic.core.internal.GenericServer; -import org.eclipse.jst.server.generic.servertype.definition.Port; -import org.eclipse.wst.server.core.IModuleArtifact; - -/** - * An abstract base class offering some utility methods facilitating the process - * of deploying a BPEL process onto a runtime and indicating a publisher of - * BPEL processes. This extends the generic server - * framework. Implementers of the <code>genericpublishers</code> extension point - * wishing to publish BPEL processes onto some runtime, may find it convenient - * to sub-class this class. - * <p> - * The minimum requirement on sub-classes is to provide an implementation of - * <code>GenericPublisher{@link #publish(IModuleArtifact[], IProgressMonitor)}</code>, - * <code>GenericPublisher{@link #unpublish(IProgressMonitor)}</code> and of - * <code></code> - * <p> - * Clients should not instantiate this class or its sub-classes as they will be - * instantiated by the WTP server framework. Clients can make use of any - * convenience methods contained in this class (all methods defined directly - * on <code>GenericBPELPublisher</code>). - * - * - * @author Bruno Wassermann, written Jun 8, 2006 - */ -public abstract class GenericBPELPublisher extends GenericPublisher { - -// TODO add utility methods that may be useful to concrete implementations - - /** - * Displays engine-specific validation warnings and errors in the BPEL - * Designer. - * <p> - * Sub-classes can call this method to provide information - * about any problems detected during deployment. - */ - protected final void submitValidationMarkers() { - // TODO decide on signature/arguments - } - - /** - * Provides access to the relevant project in the workspace in order to - * store a local copy of a generated deployment archive - * - * @param deployArchive - * @param path should probably be relative from project root and if null - * will save archive in project root - */ - protected void storeDeploymentArchive(IFile deployArchive, IPath path) { - // TODO figure out whether this is really useful - // TODO figure out the signature (should it be a file, what's the best - // way to allow specifying an additional path?) - maybe look at some - // of the methods in the WTP tutorial. - } - - /** - * Returns the host part of the server on which module is to be published. - * For example, 'localhost'. - * - * @return <code>String</code> representing host part of server on which - * module is to be published. Will return <code>null</code>, if called - * before {@link GenericPublisher#initialize()} has been called. - */ - protected String getHost() { - return getServer().getServer().getHost(); - } - - /** - * Returns http port defined for the server module is to be published on. - * <p> - * This replicates {@link GenericServer#getHttpPort()}. - * - * @return int - */ - protected int getHttpPort() { - int port = -1; - Iterator pIter = getServer().getServerDefinition().getPort().iterator(); - - while (pIter.hasNext()) { - Port aPort = (Port) pIter.next(); - - if(port == -1) { - port = Integer.parseInt(getServer().getServerDefinition().getResolver().resolveProperties(aPort.getNo())); - } - else if( "http".equals(aPort.getProtocol() ) ) { //$NON-NLS-1$ - port = Integer.parseInt(aPort.getNo()); - } - } - if( port == -1) { - port = 8080; - } - return port; - } - - /* - * we don't have something like validate in here as we are not the provider - * of an extension point, but simply providing some utility methods for - * sub-classes to use if they so wish. - * - * if we had provided our own extension point to do publishing, then - * we would probably have specified a validate() method in the abstract base - * class so that our framework could call its implementation in extensions. - * - * If it's just a utility method it should have static methods. Otherwise, - * allow it to be sub-classed and declare some methods as abstract to - * indicate to sub-classes what they need to implement. - * - * What is true though is that we cannot call such methods automatically as - * we are not really offering an extension point. - * - * TODO clarify explain this point about usage in the class comment! the methods - * will not be called automatically as we are not providing an extension - * point as initially expected. - */ - - -} Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdeBPELPublisher.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdeBPELPublisher.java 2010-11-11 16:43:18 UTC (rev 26458) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdeBPELPublisher.java 2010-11-11 17:10:14 UTC (rev 26459) @@ -13,7 +13,7 @@ import java.io.File; -import org.eclipse.bpel.apache.ode.runtime.GenericBPELPublisher; +import org.eclipse.bpel.runtimes.publishers.GenericBPELPublisher; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor;