Return-Path: X-Original-To: apmail-ode-commits-archive@www.apache.org Delivered-To: apmail-ode-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 540D31838E for ; Thu, 10 Dec 2015 06:50:01 +0000 (UTC) Received: (qmail 20276 invoked by uid 500); 10 Dec 2015 06:50:01 -0000 Delivered-To: apmail-ode-commits-archive@ode.apache.org Received: (qmail 20192 invoked by uid 500); 10 Dec 2015 06:50:01 -0000 Mailing-List: contact commits-help@ode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ode.apache.org Delivered-To: mailing list commits@ode.apache.org Received: (qmail 20176 invoked by uid 99); 10 Dec 2015 06:50:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Dec 2015 06:50:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E81A4E0AC0; Thu, 10 Dec 2015 06:50:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sathwik@apache.org To: commits@ode.apache.org Date: Thu, 10 Dec 2015 06:50:01 -0000 Message-Id: In-Reply-To: <0707530cb4d2460ab02e8294ed710819@git.apache.org> References: <0707530cb4d2460ab02e8294ed710819@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] ode git commit: ODE-1041: Moved to minimum JDK Binary compatibiltiy to JDK 6 from JDK 5 ODE-1041: Moved to minimum JDK Binary compatibiltiy to JDK 6 from JDK 5 Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/28c5769e Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/28c5769e Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/28c5769e Branch: refs/heads/ode-1.3.x Commit: 28c5769e03330352c52d4d801ddb811989672920 Parents: 5e73553 Author: sathwik Authored: Wed Dec 9 12:59:29 2015 +0530 Committer: sathwik Committed: Wed Dec 9 12:59:29 2015 +0530 ---------------------------------------------------------------------- Rakefile | 8 +- .../ProcessAndInstanceManagementImpl.java | 6 +- .../bpel/engine/cron/SystemSchedulesConfig.java | 11 +- .../ode/bpel/engine/replayer/Replayer.java | 12 +- .../bpel/engine/replayer/ReplayerContext.java | 21 +- .../bpel/runtime/channels/ActivityRecovery.java | 4 +- .../channels/ActivityRecoveryChannel.java | 21 ++ .../ActivityRecoveryChannelListener.java | 33 +++ .../ode/bpel/runtime/channels/Compensation.java | 4 +- .../runtime/channels/CompensationChannel.java | 21 ++ .../channels/CompensationChannelListener.java | 33 +++ .../runtime/channels/EventHandlerControl.java | 4 +- .../channels/EventHandlerControlChannel.java | 21 ++ .../EventHandlerControlChannelListener.java | 33 +++ .../bpel/runtime/channels/InvokeResponse.java | 4 +- .../runtime/channels/InvokeResponseChannel.java | 21 ++ .../channels/InvokeResponseChannelListener.java | 33 +++ .../ode/bpel/runtime/channels/LinkStatus.java | 4 +- .../runtime/channels/LinkStatusChannel.java | 21 ++ .../channels/LinkStatusChannelListener.java | 33 +++ .../ode/bpel/runtime/channels/ParentScope.java | 4 +- .../runtime/channels/ParentScopeChannel.java | 21 ++ .../channels/ParentScopeChannelListener.java | 33 +++ .../ode/bpel/runtime/channels/PickResponse.java | 4 +- .../runtime/channels/PickResponseChannel.java | 22 ++ .../channels/PickResponseChannelListener.java | 33 +++ .../ode/bpel/runtime/channels/Termination.java | 4 +- .../runtime/channels/TerminationChannel.java | 21 ++ .../channels/TerminationChannelListener.java | 33 +++ .../bpel/runtime/channels/TimerResponse.java | 4 +- .../runtime/channels/TimerResponseChannel.java | 21 ++ .../channels/TimerResponseChannelListener.java | 33 +++ .../ode/bpel/runtime/ActivityRecoveryTest.java | 4 +- .../ode/bpel/runtime/ProcessManagementTest.java | 74 +++--- .../org/apache/ode/store/DeploymentUnitDir.java | 8 +- .../ode/store/ProcessCleanupConfImpl.java | 7 +- .../org/apache/ode/store/ProcessConfImpl.java | 37 ++- .../org/apache/ode/store/ProcessStoreImpl.java | 23 +- .../ap/ChannelTypeAnnotationProcessor.java | 246 ++++++++++--------- .../ap/JacobAnnotationProcessorFactory.java | 72 +++--- ...om.sun.mirror.apt.AnnotationProcessorFactory | 2 +- .../main/java/org/apache/ode/jacob/Synch.java | 4 +- .../java/org/apache/ode/jacob/SynchChannel.java | 21 ++ .../apache/ode/jacob/SynchChannelListener.java | 33 +++ .../src/main/java/org/apache/ode/jacob/Val.java | 4 +- .../java/org/apache/ode/jacob/ValChannel.java | 21 ++ .../apache/ode/jacob/ValChannelListener.java | 33 +++ .../apache/ode/jacob/examples/cell/Cell.java | 4 +- .../ode/jacob/examples/cell/CellChannel.java | 21 ++ .../examples/cell/CellChannelListener.java | 33 +++ .../eratosthenes/NaturalNumberStream.java | 4 +- .../NaturalNumberStreamChannel.java | 21 ++ .../NaturalNumberStreamChannelListener.java | 33 +++ .../ode/jacob/examples/synch/SynchPrint.java | 4 +- .../jacob/examples/synch/SynchPrintChannel.java | 21 ++ .../synch/SynchPrintChannelListener.java | 33 +++ .../ode/karaf/commands/OdeCommandsBase.java | 13 +- .../ode/karaf/commands/OdeListCommand.java | 4 +- 58 files changed, 1061 insertions(+), 300 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/Rakefile ---------------------------------------------------------------------- diff --git a/Rakefile b/Rakefile index 8f4234c..bcd32b1 100644 --- a/Rakefile +++ b/Rakefile @@ -76,8 +76,8 @@ define "ode" do project.version = VERSION_NUMBER project.group = "org.apache.ode" - compile.options.source = "1.5" - compile.options.target = "1.5" + compile.options.source = "1.6" + compile.options.target = "1.6" manifest["Implementation-Vendor"] = "Apache Software Foundation" meta_inf << file("NOTICE") @@ -225,7 +225,7 @@ define "ode" do desc "ODE Runtime Engine" define "bpel-runtime" do - compile.from apt + compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-epr", "bpel-obj", "bpel-schemas", "bpel-store", "jacob", "jacob-ap", "utils", "agents"), COMMONS.collections, COMMONS.httpclient, JAXEN, JAVAX.persistence, JAVAX.stream, SAXON, WSDL4J, XMLBEANS, @@ -407,7 +407,7 @@ define "ode" do desc "ODE JAva Concurrent OBjects" define "jacob" do compile.with projects("utils", "jacob-ap"), SLF4J - compile.from apt + package :jar end http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java index e02d381..10202f2 100644 --- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java @@ -194,7 +194,7 @@ public class ProcessAndInstanceManagementImpl implements InstanceManagement, Pro } } try { - fillProcessInfoSummary(conn, procInfoList.getProcessInfoList(), custom); + fillProcessInfoSummary(conn, procInfoList.getProcessInfoArray(), custom); } catch (Exception e) { failIfSQLException(e); __log.error("Exception fetching instances summary", e); @@ -755,7 +755,7 @@ public class ProcessAndInstanceManagementImpl implements InstanceManagement, Pro if (pconf == null) throw new ProcessNotFoundException("ProcessNotFound:" + procid); fillProcessInfo(pi, pconf, custom); - fillProcessInfoSummary(conn, Collections.singletonList(pi), custom); + fillProcessInfoSummary(conn, new TProcessInfo[]{pi}, custom); } catch (ManagementException me) { throw me; } catch (Exception e) { @@ -836,7 +836,7 @@ public class ProcessAndInstanceManagementImpl implements InstanceManagement, Pro return ret; } - private void fillProcessInfoSummary(BpelDAOConnection conn, List infos, ProcessInfoCustomizer custom) { + private void fillProcessInfoSummary(BpelDAOConnection conn, TProcessInfo[] infos, ProcessInfoCustomizer custom) { if (custom.includeInstanceSummary()) { Set pids = new HashSet(); for (TProcessInfo i : infos) { http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/SystemSchedulesConfig.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/SystemSchedulesConfig.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/SystemSchedulesConfig.java index a8ca26e..cb9389a 100644 --- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/SystemSchedulesConfig.java +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/SystemSchedulesConfig.java @@ -21,6 +21,7 @@ package org.apache.ode.bpel.engine.cron; import java.io.File; import java.text.ParseException; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -73,15 +74,15 @@ public class SystemSchedulesConfig { List jobs = new ArrayList(); if( schedulesFile != null && schedulesFile.exists() ) { - for(TSchedule schedule : getSystemSchedulesDocument().getSchedules().getScheduleList()) { + for(TSchedule schedule : getSystemSchedulesDocument().getSchedules().getScheduleArray()) { CronJob job = new CronJob(); try { job.setCronExpression(new CronExpression(schedule.getWhen())); - for(final TCleanup aCleanup : schedule.getCleanupList()) { + for(final TCleanup aCleanup : schedule.getCleanupArray()) { CleanupInfo cleanupInfo = new CleanupInfo(); - assert !aCleanup.getFilterList().isEmpty(); - cleanupInfo.setFilters(aCleanup.getFilterList()); - ProcessCleanupConfImpl.processACleanup(cleanupInfo.getCategories(), aCleanup.getCategoryList()); + assert aCleanup.getFilterArray().length > 0; + cleanupInfo.setFilters(Arrays.asList(aCleanup.getFilterArray())); + ProcessCleanupConfImpl.processACleanup(cleanupInfo.getCategories(), Arrays.asList(aCleanup.getCategoryArray())); JobDetails runnableDetails = new JobDetails(); http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/Replayer.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/Replayer.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/Replayer.java index bfb4efa..1025ec9 100644 --- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/Replayer.java +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/Replayer.java @@ -19,6 +19,7 @@ package org.apache.ode.bpel.engine.replayer; import java.util.ArrayList; +import java.util.Arrays; import java.util.Calendar; import java.util.Collections; import java.util.Comparator; @@ -87,13 +88,16 @@ public class Replayer { List toDelete = new ArrayList(); List toRestore = new ArrayList(); - toDelete.addAll(request.getReplaceInstanceList()); + for (Long iid : request.getReplaceInstanceArray()) { + toDelete.add(iid); + } + - for (Long iid : request.getUpgradeInstanceList()) { + for (Long iid : request.getUpgradeInstanceArray()) { toDelete.add(iid); toRestore.add(CommunicationType.Factory.parse(getCommunication(iid, conn).toString())); } - toRestore.addAll(request.getRestoreInstanceList()); + toRestore.addAll(Arrays.asList(request.getRestoreInstanceArray())); { Set cleanupCategory = new HashSet(); @@ -141,7 +145,7 @@ public class Replayer { public GetCommunicationResponse getCommunication(GetCommunication request, BpelDAOConnection conn) throws Exception { GetCommunicationResponse response = GetCommunicationResponse.Factory.newInstance(); - for (Long iid : request.getIidList()) { + for (Long iid : request.getIidArray()) { response.addNewRestoreInstance().set(getCommunication(iid, conn)); } return response; http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerContext.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerContext.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerContext.java index e9fc5d9..631c499 100644 --- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerContext.java +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerContext.java @@ -224,23 +224,21 @@ public class ReplayerContext { replayerConfig = r; - for (ServiceConfig s : r.getServiceConfigList()) { + for (ServiceConfig s : r.getServiceConfigArray()) { servicesConfig.put(s.getService(), s); } - final List exchangeList = r.getExchangeList(); + final Exchange[] exchanges = r.getExchangeArray(); - for (int i = 1; i < exchangeList.size(); i++) { - Exchange e = exchangeList.get(i); - // We skip failures, because INVOKE_CHECK job is not handled by - // replayer + for (Exchange e : exchanges) { + // We skip failures, because INVOKE_CHECK job is not handled by replayer if (e.getType() == ExchangeType.P && !e.isSetFailure()) { answers.add(e); } } { - final Exchange e = exchangeList.get(0); + final Exchange e = exchanges[0]; final Date time = e.getCreateTime().getTime(); scheduler.scheduleReplayerJob(new Callable() { @@ -274,12 +272,11 @@ public class ReplayerContext { } }); - for (int i = 1; i < exchangeList.size(); i++) { - Exchange e2 = exchangeList.get(i); - if (e2.getType() == ExchangeType.M) { - MyRoleMessageExchangeImpl mex2 = ReplayerBpelRuntimeContextImpl.createMyRoleMex(e2, bpelEngine); + for (Exchange e : exchanges) { + if (e.getType() == ExchangeType.M) { + MyRoleMessageExchangeImpl mex2 = ReplayerBpelRuntimeContextImpl.createMyRoleMex(e, bpelEngine); runtimeContext.updateMyRoleMex(mex2); - scheduleInvoke(e2, mex2); + scheduleInvoke(e, mex2); } } return null; http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecovery.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecovery.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecovery.java index 37dca0c..14a2059 100644 --- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecovery.java +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecovery.java @@ -18,12 +18,12 @@ */ package org.apache.ode.bpel.runtime.channels; -import org.apache.ode.jacob.ap.ChannelType; + /** */ -@ChannelType + public interface ActivityRecovery { /** http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecoveryChannel.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecoveryChannel.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecoveryChannel.java new file mode 100644 index 0000000..559db78 --- /dev/null +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecoveryChannel.java @@ -0,0 +1,21 @@ +/* + * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR + * + * !!! DO NOT EDIT !!!! + * + * Generated On : Sat Dec 05 03:48:07 UTC 2015 + * For Interface : org.apache.ode.bpel.runtime.channels.ActivityRecovery + */ + +package org.apache.ode.bpel.runtime.channels; + +/** + * An auto-generated channel interface for the channel type + * {@link org.apache.ode.bpel.runtime.channels.ActivityRecovery}. + * @see org.apache.ode.bpel.runtime.channels.ActivityRecovery + * @see org.apache.ode.bpel.runtime.channels.ActivityRecoveryChannelListener + */ +public interface ActivityRecoveryChannel + extends org.apache.ode.jacob.Channel, + org.apache.ode.bpel.runtime.channels.ActivityRecovery +{} http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecoveryChannelListener.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecoveryChannelListener.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecoveryChannelListener.java new file mode 100644 index 0000000..b7b8ddb --- /dev/null +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecoveryChannelListener.java @@ -0,0 +1,33 @@ +/* + * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR + * + * !!! DO NOT EDIT !!!! + * + * Generated On : Sat Dec 05 03:48:07 UTC 2015 + * For Interface : org.apache.ode.bpel.runtime.channels.ActivityRecovery + */ + +package org.apache.ode.bpel.runtime.channels; + +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; + +/** + * An auto-generated channel listener abstract class for the + * {@link org.apache.ode.bpel.runtime.channels.ActivityRecovery} channel type. + * @see org.apache.ode.bpel.runtime.channels.ActivityRecovery + * @see org.apache.ode.bpel.runtime.channels.ActivityRecoveryChannel + */ +public abstract class ActivityRecoveryChannelListener + extends org.apache.ode.jacob.ChannelListener + implements org.apache.ode.bpel.runtime.channels.ActivityRecovery +{ + + private static final Logger __log = LoggerFactory.getLogger(org.apache.ode.bpel.runtime.channels.ActivityRecovery.class); + + protected Logger log() { return __log; } + + protected ActivityRecoveryChannelListener(org.apache.ode.bpel.runtime.channels.ActivityRecoveryChannel channel) { + super(channel); + } +} http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Compensation.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Compensation.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Compensation.java index 43cd4ed..4ad99eb 100644 --- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Compensation.java +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Compensation.java @@ -19,11 +19,11 @@ package org.apache.ode.bpel.runtime.channels; import org.apache.ode.jacob.SynchChannel; -import org.apache.ode.jacob.ap.ChannelType; + /** */ -@ChannelType + public interface Compensation { public void forget(); http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/CompensationChannel.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/CompensationChannel.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/CompensationChannel.java new file mode 100644 index 0000000..c060188 --- /dev/null +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/CompensationChannel.java @@ -0,0 +1,21 @@ +/* + * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR + * + * !!! DO NOT EDIT !!!! + * + * Generated On : Sat Dec 05 03:48:07 UTC 2015 + * For Interface : org.apache.ode.bpel.runtime.channels.Compensation + */ + +package org.apache.ode.bpel.runtime.channels; + +/** + * An auto-generated channel interface for the channel type + * {@link org.apache.ode.bpel.runtime.channels.Compensation}. + * @see org.apache.ode.bpel.runtime.channels.Compensation + * @see org.apache.ode.bpel.runtime.channels.CompensationChannelListener + */ +public interface CompensationChannel + extends org.apache.ode.jacob.Channel, + org.apache.ode.bpel.runtime.channels.Compensation +{} http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/CompensationChannelListener.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/CompensationChannelListener.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/CompensationChannelListener.java new file mode 100644 index 0000000..86d3bd8 --- /dev/null +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/CompensationChannelListener.java @@ -0,0 +1,33 @@ +/* + * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR + * + * !!! DO NOT EDIT !!!! + * + * Generated On : Sat Dec 05 03:48:07 UTC 2015 + * For Interface : org.apache.ode.bpel.runtime.channels.Compensation + */ + +package org.apache.ode.bpel.runtime.channels; + +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; + +/** + * An auto-generated channel listener abstract class for the + * {@link org.apache.ode.bpel.runtime.channels.Compensation} channel type. + * @see org.apache.ode.bpel.runtime.channels.Compensation + * @see org.apache.ode.bpel.runtime.channels.CompensationChannel + */ +public abstract class CompensationChannelListener + extends org.apache.ode.jacob.ChannelListener + implements org.apache.ode.bpel.runtime.channels.Compensation +{ + + private static final Logger __log = LoggerFactory.getLogger(org.apache.ode.bpel.runtime.channels.Compensation.class); + + protected Logger log() { return __log; } + + protected CompensationChannelListener(org.apache.ode.bpel.runtime.channels.CompensationChannel channel) { + super(channel); + } +} http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControl.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControl.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControl.java index ad7b4b6..53c9c57 100644 --- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControl.java +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControl.java @@ -18,12 +18,12 @@ */ package org.apache.ode.bpel.runtime.channels; -import org.apache.ode.jacob.ap.ChannelType; + /** * Channel used to control processing of event handler activities. */ -@ChannelType + public interface EventHandlerControl { /** http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControlChannel.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControlChannel.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControlChannel.java new file mode 100644 index 0000000..ba23139 --- /dev/null +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControlChannel.java @@ -0,0 +1,21 @@ +/* + * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR + * + * !!! DO NOT EDIT !!!! + * + * Generated On : Sat Dec 05 03:48:07 UTC 2015 + * For Interface : org.apache.ode.bpel.runtime.channels.EventHandlerControl + */ + +package org.apache.ode.bpel.runtime.channels; + +/** + * An auto-generated channel interface for the channel type + * {@link org.apache.ode.bpel.runtime.channels.EventHandlerControl}. + * @see org.apache.ode.bpel.runtime.channels.EventHandlerControl + * @see org.apache.ode.bpel.runtime.channels.EventHandlerControlChannelListener + */ +public interface EventHandlerControlChannel + extends org.apache.ode.jacob.Channel, + org.apache.ode.bpel.runtime.channels.EventHandlerControl +{} http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControlChannelListener.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControlChannelListener.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControlChannelListener.java new file mode 100644 index 0000000..a9bca49 --- /dev/null +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControlChannelListener.java @@ -0,0 +1,33 @@ +/* + * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR + * + * !!! DO NOT EDIT !!!! + * + * Generated On : Sat Dec 05 03:48:07 UTC 2015 + * For Interface : org.apache.ode.bpel.runtime.channels.EventHandlerControl + */ + +package org.apache.ode.bpel.runtime.channels; + +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; + +/** + * An auto-generated channel listener abstract class for the + * {@link org.apache.ode.bpel.runtime.channels.EventHandlerControl} channel type. + * @see org.apache.ode.bpel.runtime.channels.EventHandlerControl + * @see org.apache.ode.bpel.runtime.channels.EventHandlerControlChannel + */ +public abstract class EventHandlerControlChannelListener + extends org.apache.ode.jacob.ChannelListener + implements org.apache.ode.bpel.runtime.channels.EventHandlerControl +{ + + private static final Logger __log = LoggerFactory.getLogger(org.apache.ode.bpel.runtime.channels.EventHandlerControl.class); + + protected Logger log() { return __log; } + + protected EventHandlerControlChannelListener(org.apache.ode.bpel.runtime.channels.EventHandlerControlChannel channel) { + super(channel); + } +} http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponse.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponse.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponse.java index 6f9fb0a..cb54852 100644 --- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponse.java +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponse.java @@ -18,12 +18,12 @@ */ package org.apache.ode.bpel.runtime.channels; -import org.apache.ode.jacob.ap.ChannelType; + /** * Response channel for pick requests. */ -@ChannelType + public interface InvokeResponse { public void onResponse(); http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponseChannel.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponseChannel.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponseChannel.java new file mode 100644 index 0000000..0535c8b --- /dev/null +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponseChannel.java @@ -0,0 +1,21 @@ +/* + * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR + * + * !!! DO NOT EDIT !!!! + * + * Generated On : Sat Dec 05 03:48:07 UTC 2015 + * For Interface : org.apache.ode.bpel.runtime.channels.InvokeResponse + */ + +package org.apache.ode.bpel.runtime.channels; + +/** + * An auto-generated channel interface for the channel type + * {@link org.apache.ode.bpel.runtime.channels.InvokeResponse}. + * @see org.apache.ode.bpel.runtime.channels.InvokeResponse + * @see org.apache.ode.bpel.runtime.channels.InvokeResponseChannelListener + */ +public interface InvokeResponseChannel + extends org.apache.ode.jacob.Channel, + org.apache.ode.bpel.runtime.channels.InvokeResponse +{} http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponseChannelListener.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponseChannelListener.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponseChannelListener.java new file mode 100644 index 0000000..db89555 --- /dev/null +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponseChannelListener.java @@ -0,0 +1,33 @@ +/* + * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR + * + * !!! DO NOT EDIT !!!! + * + * Generated On : Sat Dec 05 03:48:07 UTC 2015 + * For Interface : org.apache.ode.bpel.runtime.channels.InvokeResponse + */ + +package org.apache.ode.bpel.runtime.channels; + +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; + +/** + * An auto-generated channel listener abstract class for the + * {@link org.apache.ode.bpel.runtime.channels.InvokeResponse} channel type. + * @see org.apache.ode.bpel.runtime.channels.InvokeResponse + * @see org.apache.ode.bpel.runtime.channels.InvokeResponseChannel + */ +public abstract class InvokeResponseChannelListener + extends org.apache.ode.jacob.ChannelListener + implements org.apache.ode.bpel.runtime.channels.InvokeResponse +{ + + private static final Logger __log = LoggerFactory.getLogger(org.apache.ode.bpel.runtime.channels.InvokeResponse.class); + + protected Logger log() { return __log; } + + protected InvokeResponseChannelListener(org.apache.ode.bpel.runtime.channels.InvokeResponseChannel channel) { + super(channel); + } +} http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatus.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatus.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatus.java index 9ea51fb..bbee4d5 100644 --- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatus.java +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatus.java @@ -18,11 +18,11 @@ */ package org.apache.ode.bpel.runtime.channels; -import org.apache.ode.jacob.ap.ChannelType; + /** */ -@ChannelType + public interface LinkStatus { void linkStatus(boolean value); http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatusChannel.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatusChannel.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatusChannel.java new file mode 100644 index 0000000..4638a70 --- /dev/null +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatusChannel.java @@ -0,0 +1,21 @@ +/* + * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR + * + * !!! DO NOT EDIT !!!! + * + * Generated On : Sat Dec 05 03:48:07 UTC 2015 + * For Interface : org.apache.ode.bpel.runtime.channels.LinkStatus + */ + +package org.apache.ode.bpel.runtime.channels; + +/** + * An auto-generated channel interface for the channel type + * {@link org.apache.ode.bpel.runtime.channels.LinkStatus}. + * @see org.apache.ode.bpel.runtime.channels.LinkStatus + * @see org.apache.ode.bpel.runtime.channels.LinkStatusChannelListener + */ +public interface LinkStatusChannel + extends org.apache.ode.jacob.Channel, + org.apache.ode.bpel.runtime.channels.LinkStatus +{} http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatusChannelListener.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatusChannelListener.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatusChannelListener.java new file mode 100644 index 0000000..db4a414 --- /dev/null +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatusChannelListener.java @@ -0,0 +1,33 @@ +/* + * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR + * + * !!! DO NOT EDIT !!!! + * + * Generated On : Sat Dec 05 03:48:07 UTC 2015 + * For Interface : org.apache.ode.bpel.runtime.channels.LinkStatus + */ + +package org.apache.ode.bpel.runtime.channels; + +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; + +/** + * An auto-generated channel listener abstract class for the + * {@link org.apache.ode.bpel.runtime.channels.LinkStatus} channel type. + * @see org.apache.ode.bpel.runtime.channels.LinkStatus + * @see org.apache.ode.bpel.runtime.channels.LinkStatusChannel + */ +public abstract class LinkStatusChannelListener + extends org.apache.ode.jacob.ChannelListener + implements org.apache.ode.bpel.runtime.channels.LinkStatus +{ + + private static final Logger __log = LoggerFactory.getLogger(org.apache.ode.bpel.runtime.channels.LinkStatus.class); + + protected Logger log() { return __log; } + + protected LinkStatusChannelListener(org.apache.ode.bpel.runtime.channels.LinkStatusChannel channel) { + super(channel); + } +} http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScope.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScope.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScope.java index b05306d..f54a37a 100644 --- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScope.java +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScope.java @@ -25,12 +25,12 @@ import org.apache.ode.bpel.runtime.CompensationHandler; import org.w3c.dom.Element; import java.util.Set; -import org.apache.ode.jacob.ap.ChannelType; + /** * Channel used for child-to-parent scope communication. */ -@ChannelType + public interface ParentScope { void compensate(OScope scope, SynchChannel ret); http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScopeChannel.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScopeChannel.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScopeChannel.java new file mode 100644 index 0000000..d8f7fb6 --- /dev/null +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScopeChannel.java @@ -0,0 +1,21 @@ +/* + * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR + * + * !!! DO NOT EDIT !!!! + * + * Generated On : Sat Dec 05 03:48:07 UTC 2015 + * For Interface : org.apache.ode.bpel.runtime.channels.ParentScope + */ + +package org.apache.ode.bpel.runtime.channels; + +/** + * An auto-generated channel interface for the channel type + * {@link org.apache.ode.bpel.runtime.channels.ParentScope}. + * @see org.apache.ode.bpel.runtime.channels.ParentScope + * @see org.apache.ode.bpel.runtime.channels.ParentScopeChannelListener + */ +public interface ParentScopeChannel + extends org.apache.ode.jacob.Channel, + org.apache.ode.bpel.runtime.channels.ParentScope +{} http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScopeChannelListener.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScopeChannelListener.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScopeChannelListener.java new file mode 100644 index 0000000..9f812ad --- /dev/null +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScopeChannelListener.java @@ -0,0 +1,33 @@ +/* + * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR + * + * !!! DO NOT EDIT !!!! + * + * Generated On : Sat Dec 05 03:48:07 UTC 2015 + * For Interface : org.apache.ode.bpel.runtime.channels.ParentScope + */ + +package org.apache.ode.bpel.runtime.channels; + +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; + +/** + * An auto-generated channel listener abstract class for the + * {@link org.apache.ode.bpel.runtime.channels.ParentScope} channel type. + * @see org.apache.ode.bpel.runtime.channels.ParentScope + * @see org.apache.ode.bpel.runtime.channels.ParentScopeChannel + */ +public abstract class ParentScopeChannelListener + extends org.apache.ode.jacob.ChannelListener + implements org.apache.ode.bpel.runtime.channels.ParentScope +{ + + private static final Logger __log = LoggerFactory.getLogger(org.apache.ode.bpel.runtime.channels.ParentScope.class); + + protected Logger log() { return __log; } + + protected ParentScopeChannelListener(org.apache.ode.bpel.runtime.channels.ParentScopeChannel channel) { + super(channel); + } +} http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/PickResponse.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/PickResponse.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/PickResponse.java index 2950fe4..85b8294 100644 --- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/PickResponse.java +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/PickResponse.java @@ -18,14 +18,14 @@ */ package org.apache.ode.bpel.runtime.channels; -import org.apache.ode.jacob.ap.ChannelType; + /** * Response channel for pick requests. * @jacob.kind * @jacob.parent TimerResponseChannel */ -@ChannelType + public interface PickResponse extends TimerResponse { public void onRequestRcvd(int selectorIdx, String mexId); http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/PickResponseChannel.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/PickResponseChannel.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/PickResponseChannel.java new file mode 100644 index 0000000..8b8bb1c --- /dev/null +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/PickResponseChannel.java @@ -0,0 +1,22 @@ +/* + * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR + * + * !!! DO NOT EDIT !!!! + * + * Generated On : Sat Dec 05 03:48:07 UTC 2015 + * For Interface : org.apache.ode.bpel.runtime.channels.PickResponse + */ + +package org.apache.ode.bpel.runtime.channels; + +/** + * An auto-generated channel interface for the channel type + * {@link org.apache.ode.bpel.runtime.channels.PickResponse}. + * @see org.apache.ode.bpel.runtime.channels.PickResponse + * @see org.apache.ode.bpel.runtime.channels.PickResponseChannelListener + */ +public interface PickResponseChannel + extends org.apache.ode.bpel.runtime.channels.TimerResponseChannel, + org.apache.ode.jacob.Channel, + org.apache.ode.bpel.runtime.channels.PickResponse +{} http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/PickResponseChannelListener.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/PickResponseChannelListener.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/PickResponseChannelListener.java new file mode 100644 index 0000000..32d68b7 --- /dev/null +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/PickResponseChannelListener.java @@ -0,0 +1,33 @@ +/* + * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR + * + * !!! DO NOT EDIT !!!! + * + * Generated On : Sat Dec 05 03:48:07 UTC 2015 + * For Interface : org.apache.ode.bpel.runtime.channels.PickResponse + */ + +package org.apache.ode.bpel.runtime.channels; + +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; + +/** + * An auto-generated channel listener abstract class for the + * {@link org.apache.ode.bpel.runtime.channels.PickResponse} channel type. + * @see org.apache.ode.bpel.runtime.channels.PickResponse + * @see org.apache.ode.bpel.runtime.channels.PickResponseChannel + */ +public abstract class PickResponseChannelListener + extends org.apache.ode.jacob.ChannelListener + implements org.apache.ode.bpel.runtime.channels.PickResponse +{ + + private static final Logger __log = LoggerFactory.getLogger(org.apache.ode.bpel.runtime.channels.PickResponse.class); + + protected Logger log() { return __log; } + + protected PickResponseChannelListener(org.apache.ode.bpel.runtime.channels.PickResponseChannel channel) { + super(channel); + } +} http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Termination.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Termination.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Termination.java index 3338408..2a9bb3a 100644 --- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Termination.java +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Termination.java @@ -19,12 +19,12 @@ package org.apache.ode.bpel.runtime.channels; -import org.apache.ode.jacob.ap.ChannelType; + /** * Channel used for parent-to-child scope communication. */ -@ChannelType + public interface Termination { /** http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TerminationChannel.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TerminationChannel.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TerminationChannel.java new file mode 100644 index 0000000..d814149 --- /dev/null +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TerminationChannel.java @@ -0,0 +1,21 @@ +/* + * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR + * + * !!! DO NOT EDIT !!!! + * + * Generated On : Sat Dec 05 03:48:07 UTC 2015 + * For Interface : org.apache.ode.bpel.runtime.channels.Termination + */ + +package org.apache.ode.bpel.runtime.channels; + +/** + * An auto-generated channel interface for the channel type + * {@link org.apache.ode.bpel.runtime.channels.Termination}. + * @see org.apache.ode.bpel.runtime.channels.Termination + * @see org.apache.ode.bpel.runtime.channels.TerminationChannelListener + */ +public interface TerminationChannel + extends org.apache.ode.jacob.Channel, + org.apache.ode.bpel.runtime.channels.Termination +{} http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TerminationChannelListener.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TerminationChannelListener.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TerminationChannelListener.java new file mode 100644 index 0000000..4beb026 --- /dev/null +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TerminationChannelListener.java @@ -0,0 +1,33 @@ +/* + * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR + * + * !!! DO NOT EDIT !!!! + * + * Generated On : Sat Dec 05 03:48:07 UTC 2015 + * For Interface : org.apache.ode.bpel.runtime.channels.Termination + */ + +package org.apache.ode.bpel.runtime.channels; + +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; + +/** + * An auto-generated channel listener abstract class for the + * {@link org.apache.ode.bpel.runtime.channels.Termination} channel type. + * @see org.apache.ode.bpel.runtime.channels.Termination + * @see org.apache.ode.bpel.runtime.channels.TerminationChannel + */ +public abstract class TerminationChannelListener + extends org.apache.ode.jacob.ChannelListener + implements org.apache.ode.bpel.runtime.channels.Termination +{ + + private static final Logger __log = LoggerFactory.getLogger(org.apache.ode.bpel.runtime.channels.Termination.class); + + protected Logger log() { return __log; } + + protected TerminationChannelListener(org.apache.ode.bpel.runtime.channels.TerminationChannel channel) { + super(channel); + } +} http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponse.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponse.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponse.java index e73d1b0..4fca7fb 100644 --- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponse.java +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponse.java @@ -18,12 +18,12 @@ */ package org.apache.ode.bpel.runtime.channels; -import org.apache.ode.jacob.ap.ChannelType; + /** * Channel for timer notification. */ -@ChannelType + public interface TimerResponse { /** timer event has occurred */ public void onTimeout(); http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponseChannel.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponseChannel.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponseChannel.java new file mode 100644 index 0000000..b0d2b43 --- /dev/null +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponseChannel.java @@ -0,0 +1,21 @@ +/* + * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR + * + * !!! DO NOT EDIT !!!! + * + * Generated On : Sat Dec 05 03:48:07 UTC 2015 + * For Interface : org.apache.ode.bpel.runtime.channels.TimerResponse + */ + +package org.apache.ode.bpel.runtime.channels; + +/** + * An auto-generated channel interface for the channel type + * {@link org.apache.ode.bpel.runtime.channels.TimerResponse}. + * @see org.apache.ode.bpel.runtime.channels.TimerResponse + * @see org.apache.ode.bpel.runtime.channels.TimerResponseChannelListener + */ +public interface TimerResponseChannel + extends org.apache.ode.jacob.Channel, + org.apache.ode.bpel.runtime.channels.TimerResponse +{} http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponseChannelListener.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponseChannelListener.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponseChannelListener.java new file mode 100644 index 0000000..8dab746 --- /dev/null +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponseChannelListener.java @@ -0,0 +1,33 @@ +/* + * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR + * + * !!! DO NOT EDIT !!!! + * + * Generated On : Sat Dec 05 03:48:07 UTC 2015 + * For Interface : org.apache.ode.bpel.runtime.channels.TimerResponse + */ + +package org.apache.ode.bpel.runtime.channels; + +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; + +/** + * An auto-generated channel listener abstract class for the + * {@link org.apache.ode.bpel.runtime.channels.TimerResponse} channel type. + * @see org.apache.ode.bpel.runtime.channels.TimerResponse + * @see org.apache.ode.bpel.runtime.channels.TimerResponseChannel + */ +public abstract class TimerResponseChannelListener + extends org.apache.ode.jacob.ChannelListener + implements org.apache.ode.bpel.runtime.channels.TimerResponse +{ + + private static final Logger __log = LoggerFactory.getLogger(org.apache.ode.bpel.runtime.channels.TimerResponse.class); + + protected Logger log() { return __log; } + + protected TimerResponseChannelListener(org.apache.ode.bpel.runtime.channels.TimerResponseChannel channel) { + super(channel); + } +} http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ActivityRecoveryTest.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ActivityRecoveryTest.java b/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ActivityRecoveryTest.java index 7fd20a8..e3e51b9 100644 --- a/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ActivityRecoveryTest.java +++ b/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ActivityRecoveryTest.java @@ -264,7 +264,7 @@ public class ActivityRecoveryTest extends TestCase { // Stay active, awaiting recovery. TInstanceSummary summary = _management.getProcessInfo(_processId).getProcessInfo().getInstanceSummary(); - for (TInstanceSummary.Instances instances : summary.getInstancesList()) { + for (TInstanceSummary.Instances instances : summary.getInstancesArray()) { switch (instances.getState().intValue()) { case TInstanceStatus.INT_COMPLETED: assertTrue(instances.getCount() == 1); @@ -513,7 +513,7 @@ public class ActivityRecoveryTest extends TestCase { } else assertNull(activity.getFailure()); } - for (TScopeRef ref : scope.getChildren().getChildRefList()) { + for (TScopeRef ref : scope.getChildren().getChildRefArray()) { TScopeInfo child = _management.getScopeInfoWithActivity(ref.getSiid(), true).getScopeInfo(); if (child != null) getRecoveriesInScope(instance, child, recoveries); http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ProcessManagementTest.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ProcessManagementTest.java b/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ProcessManagementTest.java index 6e30b31..9f8d10c 100644 --- a/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ProcessManagementTest.java +++ b/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ProcessManagementTest.java @@ -40,59 +40,59 @@ public class ProcessManagementTest extends TestCase { BpelManagementFacade _management; QName _processQName; - + public void testFilterProcessesByName() throws Exception { - List pilist = _management.listProcesses(null,null).getProcessInfoList().getProcessInfoList(); - assertEquals(6,pilist.size()); - - pilist = _management.listProcesses("name=FailureInh*",null).getProcessInfoList().getProcessInfoList(); - assertEquals(1,pilist.size()); - - pilist = _management.listProcesses("name=FailureToRecovery*",null).getProcessInfoList().getProcessInfoList(); - assertEquals(1,pilist.size()); - - pilist = _management.listProcesses("name=foobaz*",null).getProcessInfoList().getProcessInfoList(); - assertEquals(0,pilist.size()); - - pilist = _management.listProcesses("namespace="+NAMESPACE,null).getProcessInfoList().getProcessInfoList(); - assertEquals(6,pilist.size()); - - pilist = _management.listProcesses("namespace=http:*",null).getProcessInfoList().getProcessInfoList(); - assertEquals(6,pilist.size()); - - pilist = _management.listProcesses("namespace=foo:*",null).getProcessInfoList().getProcessInfoList(); - assertEquals(0,pilist.size()); + TProcessInfo[] pilist = _management.listProcesses(null,null).getProcessInfoList().getProcessInfoArray(); + assertEquals(6,pilist.length); + + pilist = _management.listProcesses("name=FailureInh*",null).getProcessInfoList().getProcessInfoArray(); + assertEquals(1,pilist.length); + + pilist = _management.listProcesses("name=FailureToRecovery*",null).getProcessInfoList().getProcessInfoArray(); + assertEquals(1,pilist.length); + + pilist = _management.listProcesses("name=foobaz*",null).getProcessInfoList().getProcessInfoArray(); + assertEquals(0,pilist.length); + + pilist = _management.listProcesses("namespace="+NAMESPACE,null).getProcessInfoList().getProcessInfoArray(); + assertEquals(6,pilist.length); + + pilist = _management.listProcesses("namespace=http:*",null).getProcessInfoList().getProcessInfoArray(); + assertEquals(6,pilist.length); + + pilist = _management.listProcesses("namespace=foo:*",null).getProcessInfoList().getProcessInfoArray(); + assertEquals(0,pilist.length); } public void testListProcessesOrder() { - List pilist = - _management.listProcesses(null,"name").getProcessInfoList().getProcessInfoList(); + TProcessInfo[] pilist = + _management.listProcesses(null,"name").getProcessInfoList().getProcessInfoArray(); - for (int i = 1 ; i < pilist.size(); ++i) { - QName qname = QName.valueOf(pilist.get(i).getPid()); - QName qnamePrev = QName.valueOf(pilist.get(i-1).getPid()); + for (int i = 1 ; i < pilist.length; ++i) { + QName qname = QName.valueOf(pilist[i].getPid()); + QName qnamePrev = QName.valueOf(pilist[i-1].getPid()); assertTrue(0<=qname.getLocalPart().compareTo(qnamePrev.getLocalPart())); } - pilist = - _management.listProcesses(null,"-name").getProcessInfoList().getProcessInfoList(); + pilist = + _management.listProcesses(null,"-name").getProcessInfoList().getProcessInfoArray(); - for (int i = 1 ; i < pilist.size(); ++i) { - QName qname = QName.valueOf(pilist.get(i).getPid()); - QName qnamePrev = QName.valueOf(pilist.get(i-1).getPid()); + for (int i = 1 ; i < pilist.length; ++i) { + QName qname = QName.valueOf(pilist[i].getPid()); + QName qnamePrev = QName.valueOf(pilist[i-1].getPid()); assertTrue(0>=qname.getLocalPart().compareTo(qnamePrev.getLocalPart())); } } - + public void testListProcessCustom() { - List pilist = - _management.listProcessesCustom(null,"name", ProcessInfoCustomizer.ALL).getProcessInfoList().getProcessInfoList(); - assertEquals(6,pilist.size()); + TProcessInfo[] pilist = + _management.listProcessesCustom(null,"name", ProcessInfoCustomizer.ALL).getProcessInfoList().getProcessInfoArray(); + assertEquals(6,pilist.length); } - + protected void setUp() throws Exception { - + _server = new MockBpelServer(); _server.deploy(new File(new URI(this.getClass().getResource("/recovery").toString()))); _management = new BpelManagementFacadeImpl(_server._server,_server._store); http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java ---------------------------------------------------------------------- diff --git a/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java b/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java index bd3a58b..9d9bbb8 100644 --- a/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java +++ b/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java @@ -176,7 +176,7 @@ class DeploymentUnitDir { _processes = processes; HashMap processInfo = new HashMap(); - for (TDeployment.Process p : getDeploymentDescriptor().getDeploy().getProcessList()) { + for (TDeployment.Process p : getDeploymentDescriptor().getDeploy().getProcessArray()) { processInfo.put(p.getName(), p); } _processInfo = processInfo; @@ -359,8 +359,7 @@ class DeploymentUnitDir { } private Map prepareCompileProperties(File bpelFile) { - List plist = getDeploymentDescriptor().getDeploy().getProcessList(); - for (Process process : plist) { + for (Process process : getDeploymentDescriptor().getDeploy().getProcessArray()) { if (process.getFileName() == null || "".equals(process.getFileName())) continue; @@ -382,8 +381,7 @@ class DeploymentUnitDir { * @return file name of the WSDL, or null if none specified. */ private File findBpel11Wsdl(File bpelFile) { - List plist = getDeploymentDescriptor().getDeploy().getProcessList(); - for (Process process : plist) { + for (Process process : getDeploymentDescriptor().getDeploy().getProcessArray()) { if (process.getFileName() == null || "".equals(process.getFileName())) continue; if (!bpelFile.getName().equals(process.getFileName())) http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-store/src/main/java/org/apache/ode/store/ProcessCleanupConfImpl.java ---------------------------------------------------------------------- diff --git a/bpel-store/src/main/java/org/apache/ode/store/ProcessCleanupConfImpl.java b/bpel-store/src/main/java/org/apache/ode/store/ProcessCleanupConfImpl.java index 5135bfd..845231f 100644 --- a/bpel-store/src/main/java/org/apache/ode/store/ProcessCleanupConfImpl.java +++ b/bpel-store/src/main/java/org/apache/ode/store/ProcessCleanupConfImpl.java @@ -19,6 +19,7 @@ package org.apache.ode.store; +import java.util.Arrays; import java.util.EnumSet; import java.util.List; import java.util.Set; @@ -38,12 +39,12 @@ public class ProcessCleanupConfImpl { // package default ProcessCleanupConfImpl(TDeployment.Process pinfo) { - for( TCleanup cleanup : pinfo.getCleanupList() ) { + for( TCleanup cleanup : pinfo.getCleanupArray() ) { if( cleanup.getOn() == TCleanup.On.SUCCESS || cleanup.getOn() == TCleanup.On.ALWAYS ) { - processACleanup(successCategories, cleanup.getCategoryList()); + processACleanup(successCategories, Arrays.asList(cleanup.getCategoryArray())); } if( cleanup.getOn() == TCleanup.On.FAILURE || cleanup.getOn() == TCleanup.On.ALWAYS ) { - processACleanup(failureCategories, cleanup.getCategoryList()); + processACleanup(failureCategories, Arrays.asList(cleanup.getCategoryArray())); } } http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java ---------------------------------------------------------------------- diff --git a/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java b/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java index 668547a..977046f 100644 --- a/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java +++ b/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java @@ -163,15 +163,15 @@ public class ProcessConfImpl implements ProcessConf { private void initMexInterceptors() { if (_pinfo.getMexInterceptors() != null) { - for (TMexInterceptor mexInterceptor : _pinfo.getMexInterceptors().getMexInterceptorList()) { + for (TMexInterceptor mexInterceptor : _pinfo.getMexInterceptors().getMexInterceptorArray()) { _mexi.add(mexInterceptor.getClassName()); } } } private void initLinks() { - if (_pinfo.getInvokeList() != null) { - for (TInvoke invoke : _pinfo.getInvokeList()) { + if (_pinfo.getInvokeArray() != null) { + for (TInvoke invoke : _pinfo.getInvokeArray()) { String plinkName = invoke.getPartnerLink(); TService service = invoke.getService(); // NOTE: service can be null for partner links @@ -199,8 +199,8 @@ public class ProcessConfImpl implements ProcessConf { } } - if (_pinfo.getProvideList() != null) { - for (TProvide provide : _pinfo.getProvideList()) { + if (_pinfo.getProvideArray() != null) { + for (TProvide provide : _pinfo.getProvideArray()) { String plinkName = provide.getPartnerLink(); TService service = provide.getService(); if (service == null) { @@ -417,20 +417,19 @@ public class ProcessConfImpl implements ProcessConf { } // Events filtered at the process level - if (processEvents.getEnableEventList() != null && !processEvents.getEnableEventList().isEmpty()) { - List enabled = processEvents.getEnableEventList(); + if (processEvents.getEnableEventArray() != null && processEvents.getEnableEventArray().length > 0) { HashSet evtSet = new HashSet(); - for (String enEvt : enabled) { + for (String enEvt : processEvents.getEnableEventArray()) { evtSet.add(BpelEvent.TYPE.valueOf(enEvt)); } _events.put(null, evtSet); } // Events filtered at the scope level - if (processEvents.getScopeEventsList() != null) { - for (TScopeEvents tScopeEvents : processEvents.getScopeEventsList()) { + if (processEvents.getScopeEventsArray() != null) { + for (TScopeEvents tScopeEvents : processEvents.getScopeEventsArray()) { HashSet evtSet = new HashSet(); - for (String enEvt : tScopeEvents.getEnableEventList()) { + for (String enEvt : tScopeEvents.getEnableEventArray()) { evtSet.add(BpelEvent.TYPE.valueOf(enEvt)); } _events.put(tScopeEvents.getName(), evtSet); @@ -527,9 +526,9 @@ public class ProcessConfImpl implements ProcessConf { } private void initSchedules() { - for(TSchedule schedule : _pinfo.getScheduleList()) { - for(TCleanup cleanup : schedule.getCleanupList()) { - assert !cleanup.getFilterList().isEmpty(); + for(TSchedule schedule : _pinfo.getScheduleArray()) { + for(TCleanup cleanup : schedule.getCleanupArray()) { + assert cleanup.getFilterArray().length > 0; } } } @@ -537,15 +536,15 @@ public class ProcessConfImpl implements ProcessConf { public List getCronJobs() { List jobs = new ArrayList(); - for(TSchedule schedule : _pinfo.getScheduleList()) { + for(TSchedule schedule : _pinfo.getScheduleArray()) { CronJob job = new CronJob(); try { job.setCronExpression(new CronExpression(schedule.getWhen())); - for(TCleanup aCleanup : schedule.getCleanupList()) { + for(TCleanup aCleanup : schedule.getCleanupArray()) { CleanupInfo cleanupInfo = new CleanupInfo(); - assert !aCleanup.getFilterList().isEmpty(); - cleanupInfo.setFilters(aCleanup.getFilterList()); - ProcessCleanupConfImpl.processACleanup(cleanupInfo.getCategories(), aCleanup.getCategoryList()); + assert aCleanup.getFilterArray().length > 0; + cleanupInfo.setFilters(Arrays.asList(aCleanup.getFilterArray())); + ProcessCleanupConfImpl.processACleanup(cleanupInfo.getCategories(), Arrays.asList(aCleanup.getCategoryArray())); JobDetails runnableDetails = new JobDetails(); runnableDetails.getDetailsExt().put("cleanupInfo", cleanupInfo); http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java ---------------------------------------------------------------------- diff --git a/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java b/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java index 5b49655..45dd75f 100644 --- a/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java +++ b/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java @@ -232,7 +232,7 @@ public class ProcessStoreImpl implements ProcessStore { retirePreviousPackageVersions(du); - for (TDeployment.Process processDD : dd.getDeploy().getProcessList()) { + for (TDeployment.Process processDD : dd.getDeploy().getProcessArray()) { QName pid = toPid(processDD.getName(), version); if (_processes.containsKey(pid)) { @@ -680,19 +680,18 @@ public class ProcessStoreImpl implements ProcessStore { ret.put(new QName(key), doc.getDocumentElement()); } - if (dd.getPropertyList().size() > 0) { - for (TDeployment.Process.Property property : dd.getPropertyList()) { - Element elmtContent = DOMUtils.getElementContent(property.getDomNode()); - if (elmtContent != null) { - // We'll need DOM Level 3 - Document doc = DOMUtils.newDocument(); - doc.appendChild(doc.importNode(elmtContent, true)); - ret.put(property.getName(), doc.getDocumentElement()); - } else - ret.put(property.getName(), property.getDomNode().getFirstChild()); + for (TDeployment.Process.Property property : dd.getPropertyArray()) { + Element elmtContent = DOMUtils.getElementContent(property.getDomNode()); + if (elmtContent != null) { + // We'll need DOM Level 3 + Document doc = DOMUtils.newDocument(); + doc.appendChild(doc.importNode(elmtContent, true)); + ret.put(property.getName(), doc.getDocumentElement()); + } else + ret.put(property.getName(), property.getDomNode().getFirstChild()); } - } + return ret; } http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/jacob-ap/src/main/java/org/apache/ode/jacob/ap/ChannelTypeAnnotationProcessor.java ---------------------------------------------------------------------- diff --git a/jacob-ap/src/main/java/org/apache/ode/jacob/ap/ChannelTypeAnnotationProcessor.java b/jacob-ap/src/main/java/org/apache/ode/jacob/ap/ChannelTypeAnnotationProcessor.java index 44ec8ca..c2abb29 100644 --- a/jacob-ap/src/main/java/org/apache/ode/jacob/ap/ChannelTypeAnnotationProcessor.java +++ b/jacob-ap/src/main/java/org/apache/ode/jacob/ap/ChannelTypeAnnotationProcessor.java @@ -18,127 +18,129 @@ */ package org.apache.ode.jacob.ap; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.Collection; -import java.util.Date; +//import java.io.IOException; +//import java.io.PrintWriter; +//import java.util.Collection; +//import java.util.Date; -import com.sun.mirror.apt.AnnotationProcessor; -import com.sun.mirror.apt.AnnotationProcessorEnvironment; -import com.sun.mirror.declaration.AnnotationTypeDeclaration; -import com.sun.mirror.declaration.InterfaceDeclaration; -import com.sun.mirror.type.InterfaceType; -import com.sun.mirror.util.DeclarationFilter; +//import com.sun.mirror.apt.AnnotationProcessor; +//import com.sun.mirror.apt.AnnotationProcessorEnvironment; +//import com.sun.mirror.declaration.AnnotationTypeDeclaration; +//import com.sun.mirror.declaration.InterfaceDeclaration; +//import com.sun.mirror.type.InterfaceType; +//import com.sun.mirror.util.DeclarationFilter; +// +//class ChannelTypeAnnotationProcessor implements AnnotationProcessor { +// +// AnnotationProcessorEnvironment _env; +// AnnotationTypeDeclaration _atd; +// +// ChannelTypeAnnotationProcessor(AnnotationTypeDeclaration atd, AnnotationProcessorEnvironment env) { +// _atd = atd; +// _env = env; +// } +// +// public void process() { +// Collection channels = DeclarationFilter.getFilter(InterfaceDeclaration.class).filter(_env.getDeclarationsAnnotatedWith(_atd),InterfaceDeclaration.class); +// for (InterfaceDeclaration c : channels) { +// PrintWriter pw = null; +// try { +// pw = _env.getFiler().createSourceFile(c.getQualifiedName() + "Channel"); +// writeChannelClass(pw, c); +// } catch (IOException e) { +// _env.getMessager().printError(c.getPosition(), "IO Error: " + e.getMessage()); +// } finally { +// if (pw != null) pw.close(); +// pw = null; +// } +// +// try { +// pw = _env.getFiler().createSourceFile(c.getQualifiedName() + "ChannelListener"); +// writeChannelListenerClass(pw, c); +// } catch (IOException e) { +// _env.getMessager().printError(c.getPosition(), "IO Error: " + e.getMessage()); +// } finally { +// if (pw != null) pw.close(); +// pw = null; +// } +// +// } +// } +// +// +// private void writeChannelClass(PrintWriter pw, InterfaceDeclaration c) { +// pw.println("/*"); +// pw.println(" * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR"); +// pw.println(" * "); +// pw.println(" * !!! DO NOT EDIT !!!! "); +// pw.println(" * "); +// pw.println(" * Generated On : " + new Date()); +// pw.println(" * For Interface : " + c.getQualifiedName()); +// pw.println(" */"); +// pw.println(); +// pw.println("package " + c.getPackage().getQualifiedName() + ";"); +// pw.println(); +// +// pw.println("/**"); +// pw.println(" * An auto-generated channel interface for the channel type"); +// pw.println(" * {@link " + c.getQualifiedName() + "}."); +// pw.println(" * @see " + c.getQualifiedName() ); +// pw.println(" * @see " + c.getQualifiedName() + "ChannelListener"); +// pw.println(" */"); +// pw.println("public interface " + c.getSimpleName() + "Channel"); +// +// Collection supers = c.getSuperinterfaces(); +// if (supers.isEmpty()) { +// pw.println(" extends org.apache.ode.jacob.Channel, "); +// } else { +// pw.print(" extends "); +// for (InterfaceType s : supers) +// pw.println(" "+ s.getDeclaration().getQualifiedName() + "Channel, "); +// pw.println (" org.apache.ode.jacob.Channel, "); +// } +// +// pw.println(" " + c.getQualifiedName()); +// pw.println("{}"); +// pw.flush(); +// } +// +// private void writeChannelListenerClass(PrintWriter pw, InterfaceDeclaration c) { +// pw.println("/*"); +// pw.println(" * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR"); +// pw.println(" * "); +// pw.println(" * !!! DO NOT EDIT !!!! "); +// pw.println(" * "); +// pw.println(" * Generated On : " + new Date()); +// pw.println(" * For Interface : " + c.getQualifiedName()); +// pw.println(" */"); +// pw.println(); +// pw.println("package " + c.getPackage().getQualifiedName() + ";"); +// pw.println(); +// pw.println("import org.slf4j.LoggerFactory;"); +// pw.println("import org.slf4j.Logger;"); +// pw.println(); +// pw.println("/**"); +// pw.println(" * An auto-generated channel listener abstract class for the "); +// pw.println(" * {@link " + c.getQualifiedName() + "} channel type. "); +// pw.println(" * @see " + c.getQualifiedName() ); +// pw.println(" * @see " + c.getQualifiedName() + "Channel"); +// pw.println(" */"); +// pw.println("public abstract class " + c.getSimpleName() + "ChannelListener"); +// pw.println(" extends org.apache.ode.jacob.ChannelListener<" + c.getQualifiedName() + "Channel>" ); +// pw.println(" implements " + c.getQualifiedName()); +// pw.println("{"); +// pw.println(); +// pw.println(" private static final Logger __log = LoggerFactory.getLogger(" + c.getQualifiedName() + ".class);"); +// pw.println(); +// pw.println(" protected Logger log() { return __log; } " ); +// pw.println(); +// pw.println(" protected " + c.getSimpleName() + "ChannelListener(" + c.getQualifiedName() + "Channel channel) {"); +// pw.println(" super(channel);"); +// pw.println(" }"); +// pw.println("}"); +// pw.flush(); +// } +// +//} -class ChannelTypeAnnotationProcessor implements AnnotationProcessor { - - AnnotationProcessorEnvironment _env; - AnnotationTypeDeclaration _atd; - - ChannelTypeAnnotationProcessor(AnnotationTypeDeclaration atd, AnnotationProcessorEnvironment env) { - _atd = atd; - _env = env; - } - - public void process() { - Collection channels = DeclarationFilter.getFilter(InterfaceDeclaration.class).filter(_env.getDeclarationsAnnotatedWith(_atd),InterfaceDeclaration.class); - for (InterfaceDeclaration c : channels) { - PrintWriter pw = null; - try { - pw = _env.getFiler().createSourceFile(c.getQualifiedName() + "Channel"); - writeChannelClass(pw, c); - } catch (IOException e) { - _env.getMessager().printError(c.getPosition(), "IO Error: " + e.getMessage()); - } finally { - if (pw != null) pw.close(); - pw = null; - } - - try { - pw = _env.getFiler().createSourceFile(c.getQualifiedName() + "ChannelListener"); - writeChannelListenerClass(pw, c); - } catch (IOException e) { - _env.getMessager().printError(c.getPosition(), "IO Error: " + e.getMessage()); - } finally { - if (pw != null) pw.close(); - pw = null; - } - - } - } - - - private void writeChannelClass(PrintWriter pw, InterfaceDeclaration c) { - pw.println("/*"); - pw.println(" * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR"); - pw.println(" * "); - pw.println(" * !!! DO NOT EDIT !!!! "); - pw.println(" * "); - pw.println(" * Generated On : " + new Date()); - pw.println(" * For Interface : " + c.getQualifiedName()); - pw.println(" */"); - pw.println(); - pw.println("package " + c.getPackage().getQualifiedName() + ";"); - pw.println(); - - pw.println("/**"); - pw.println(" * An auto-generated channel interface for the channel type"); - pw.println(" * {@link " + c.getQualifiedName() + "}."); - pw.println(" * @see " + c.getQualifiedName() ); - pw.println(" * @see " + c.getQualifiedName() + "ChannelListener"); - pw.println(" */"); - pw.println("public interface " + c.getSimpleName() + "Channel"); - - Collection supers = c.getSuperinterfaces(); - if (supers.isEmpty()) { - pw.println(" extends org.apache.ode.jacob.Channel, "); - } else { - pw.print(" extends "); - for (InterfaceType s : supers) - pw.println(" "+ s.getDeclaration().getQualifiedName() + "Channel, "); - pw.println (" org.apache.ode.jacob.Channel, "); - } - - pw.println(" " + c.getQualifiedName()); - pw.println("{}"); - pw.flush(); - } - - private void writeChannelListenerClass(PrintWriter pw, InterfaceDeclaration c) { - pw.println("/*"); - pw.println(" * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR"); - pw.println(" * "); - pw.println(" * !!! DO NOT EDIT !!!! "); - pw.println(" * "); - pw.println(" * Generated On : " + new Date()); - pw.println(" * For Interface : " + c.getQualifiedName()); - pw.println(" */"); - pw.println(); - pw.println("package " + c.getPackage().getQualifiedName() + ";"); - pw.println(); - pw.println("import org.slf4j.LoggerFactory;"); - pw.println("import org.slf4j.Logger;"); - pw.println(); - pw.println("/**"); - pw.println(" * An auto-generated channel listener abstract class for the "); - pw.println(" * {@link " + c.getQualifiedName() + "} channel type. "); - pw.println(" * @see " + c.getQualifiedName() ); - pw.println(" * @see " + c.getQualifiedName() + "Channel"); - pw.println(" */"); - pw.println("public abstract class " + c.getSimpleName() + "ChannelListener"); - pw.println(" extends org.apache.ode.jacob.ChannelListener<" + c.getQualifiedName() + "Channel>" ); - pw.println(" implements " + c.getQualifiedName()); - pw.println("{"); - pw.println(); - pw.println(" private static final Logger __log = LoggerFactory.getLogger(" + c.getQualifiedName() + ".class);"); - pw.println(); - pw.println(" protected Logger log() { return __log; } " ); - pw.println(); - pw.println(" protected " + c.getSimpleName() + "ChannelListener(" + c.getQualifiedName() + "Channel channel) {"); - pw.println(" super(channel);"); - pw.println(" }"); - pw.println("}"); - pw.flush(); - } - -} +class ChannelTypeAnnotationProcessor {} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/jacob-ap/src/main/java/org/apache/ode/jacob/ap/JacobAnnotationProcessorFactory.java ---------------------------------------------------------------------- diff --git a/jacob-ap/src/main/java/org/apache/ode/jacob/ap/JacobAnnotationProcessorFactory.java b/jacob-ap/src/main/java/org/apache/ode/jacob/ap/JacobAnnotationProcessorFactory.java index 11cfa6d..aa1f233 100644 --- a/jacob-ap/src/main/java/org/apache/ode/jacob/ap/JacobAnnotationProcessorFactory.java +++ b/jacob-ap/src/main/java/org/apache/ode/jacob/ap/JacobAnnotationProcessorFactory.java @@ -18,41 +18,43 @@ */ package org.apache.ode.jacob.ap; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Set; +//import java.util.Arrays; +//import java.util.Collection; +//import java.util.Collections; +//import java.util.List; +//import java.util.Set; -import com.sun.mirror.apt.AnnotationProcessor; -import com.sun.mirror.apt.AnnotationProcessorEnvironment; -import com.sun.mirror.apt.AnnotationProcessorFactory; -import com.sun.mirror.apt.AnnotationProcessors; -import com.sun.mirror.declaration.AnnotationTypeDeclaration; +//import com.sun.mirror.apt.AnnotationProcessor; +//import com.sun.mirror.apt.AnnotationProcessorEnvironment; +//import com.sun.mirror.apt.AnnotationProcessorFactory; +//import com.sun.mirror.apt.AnnotationProcessors; +//import com.sun.mirror.declaration.AnnotationTypeDeclaration; -public class JacobAnnotationProcessorFactory implements AnnotationProcessorFactory { +//public class JacobAnnotationProcessorFactory implements AnnotationProcessorFactory { +// +// private static final List __supported = Arrays.asList( +// new String[] { ChannelType.class.getName() }); +// +// public Collection supportedOptions() { +// return Collections.emptyList(); +// } +// +// public Collection supportedAnnotationTypes() { +// return __supported; +// } +// +// public AnnotationProcessor getProcessorFor(Set atd, AnnotationProcessorEnvironment ape) { +// +// if (atd.isEmpty()) +// return AnnotationProcessors.NO_OP; +// +// for (AnnotationTypeDeclaration a: atd) { +// if (a.getQualifiedName().equals(ChannelType.class.getName())) +// return new ChannelTypeAnnotationProcessor(a,ape); +// } +// return AnnotationProcessors.NO_OP; +// } +// +//} - private static final List __supported = Arrays.asList( - new String[] { ChannelType.class.getName() }); - - public Collection supportedOptions() { - return Collections.emptyList(); - } - - public Collection supportedAnnotationTypes() { - return __supported; - } - - public AnnotationProcessor getProcessorFor(Set atd, AnnotationProcessorEnvironment ape) { - - if (atd.isEmpty()) - return AnnotationProcessors.NO_OP; - - for (AnnotationTypeDeclaration a: atd) { - if (a.getQualifiedName().equals(ChannelType.class.getName())) - return new ChannelTypeAnnotationProcessor(a,ape); - } - return AnnotationProcessors.NO_OP; - } - -} +public class JacobAnnotationProcessorFactory {} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/jacob-ap/src/main/resources/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory ---------------------------------------------------------------------- diff --git a/jacob-ap/src/main/resources/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory b/jacob-ap/src/main/resources/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory index 62941f0..8b13789 100644 --- a/jacob-ap/src/main/resources/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory +++ b/jacob-ap/src/main/resources/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory @@ -1 +1 @@ -org.apache.ode.jacob.ap.JacobAnnotationProcessorFactory + http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/jacob/src/main/java/org/apache/ode/jacob/Synch.java ---------------------------------------------------------------------- diff --git a/jacob/src/main/java/org/apache/ode/jacob/Synch.java b/jacob/src/main/java/org/apache/ode/jacob/Synch.java index c2dc934..d335133 100644 --- a/jacob/src/main/java/org/apache/ode/jacob/Synch.java +++ b/jacob/src/main/java/org/apache/ode/jacob/Synch.java @@ -18,7 +18,7 @@ */ package org.apache.ode.jacob; -import org.apache.ode.jacob.ap.ChannelType; + /** * Synch represents a synchronous invocation callback notification. @@ -27,7 +27,7 @@ import org.apache.ode.jacob.ap.ChannelType; * * @author Maciej Szefler mbs */ -@ChannelType + public interface Synch { public void ret(); } http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/jacob/src/main/java/org/apache/ode/jacob/SynchChannel.java ---------------------------------------------------------------------- diff --git a/jacob/src/main/java/org/apache/ode/jacob/SynchChannel.java b/jacob/src/main/java/org/apache/ode/jacob/SynchChannel.java new file mode 100644 index 0000000..997a622 --- /dev/null +++ b/jacob/src/main/java/org/apache/ode/jacob/SynchChannel.java @@ -0,0 +1,21 @@ +/* + * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR + * + * !!! DO NOT EDIT !!!! + * + * Generated On : Sat Dec 05 03:48:03 UTC 2015 + * For Interface : org.apache.ode.jacob.Synch + */ + +package org.apache.ode.jacob; + +/** + * An auto-generated channel interface for the channel type + * {@link org.apache.ode.jacob.Synch}. + * @see org.apache.ode.jacob.Synch + * @see org.apache.ode.jacob.SynchChannelListener + */ +public interface SynchChannel + extends org.apache.ode.jacob.Channel, + org.apache.ode.jacob.Synch +{} http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/jacob/src/main/java/org/apache/ode/jacob/SynchChannelListener.java ---------------------------------------------------------------------- diff --git a/jacob/src/main/java/org/apache/ode/jacob/SynchChannelListener.java b/jacob/src/main/java/org/apache/ode/jacob/SynchChannelListener.java new file mode 100644 index 0000000..49220f4 --- /dev/null +++ b/jacob/src/main/java/org/apache/ode/jacob/SynchChannelListener.java @@ -0,0 +1,33 @@ +/* + * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR + * + * !!! DO NOT EDIT !!!! + * + * Generated On : Sat Dec 05 03:48:03 UTC 2015 + * For Interface : org.apache.ode.jacob.Synch + */ + +package org.apache.ode.jacob; + +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; + +/** + * An auto-generated channel listener abstract class for the + * {@link org.apache.ode.jacob.Synch} channel type. + * @see org.apache.ode.jacob.Synch + * @see org.apache.ode.jacob.SynchChannel + */ +public abstract class SynchChannelListener + extends org.apache.ode.jacob.ChannelListener + implements org.apache.ode.jacob.Synch +{ + + private static final Logger __log = LoggerFactory.getLogger(org.apache.ode.jacob.Synch.class); + + protected Logger log() { return __log; } + + protected SynchChannelListener(org.apache.ode.jacob.SynchChannel channel) { + super(channel); + } +} http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/jacob/src/main/java/org/apache/ode/jacob/Val.java ---------------------------------------------------------------------- diff --git a/jacob/src/main/java/org/apache/ode/jacob/Val.java b/jacob/src/main/java/org/apache/ode/jacob/Val.java index 07f37d0..25e860d 100644 --- a/jacob/src/main/java/org/apache/ode/jacob/Val.java +++ b/jacob/src/main/java/org/apache/ode/jacob/Val.java @@ -18,11 +18,11 @@ */ package org.apache.ode.jacob; -import org.apache.ode.jacob.ap.ChannelType; + /** * Generic return-value channel type. */ -@ChannelType + public interface Val { public void val(Object retVal); } http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/jacob/src/main/java/org/apache/ode/jacob/ValChannel.java ---------------------------------------------------------------------- diff --git a/jacob/src/main/java/org/apache/ode/jacob/ValChannel.java b/jacob/src/main/java/org/apache/ode/jacob/ValChannel.java new file mode 100644 index 0000000..036ff33 --- /dev/null +++ b/jacob/src/main/java/org/apache/ode/jacob/ValChannel.java @@ -0,0 +1,21 @@ +/* + * SOURCE FILE GENERATATED BY JACOB CHANNEL CLASS GENERATOR + * + * !!! DO NOT EDIT !!!! + * + * Generated On : Sat Dec 05 03:48:03 UTC 2015 + * For Interface : org.apache.ode.jacob.Val + */ + +package org.apache.ode.jacob; + +/** + * An auto-generated channel interface for the channel type + * {@link org.apache.ode.jacob.Val}. + * @see org.apache.ode.jacob.Val + * @see org.apache.ode.jacob.ValChannelListener + */ +public interface ValChannel + extends org.apache.ode.jacob.Channel, + org.apache.ode.jacob.Val +{}