ode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sath...@apache.org
Subject [1/2] ode git commit: ODE-1041: Moved to minimum JDK Binary compatibiltiy to JDK 6 from JDK 5
Date Thu, 10 Dec 2015 06:50:00 GMT
Repository: ode
Updated Branches:
  refs/heads/ode-1.3.x 5e73553c9 -> 28c5769e0


http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/jacob/src/main/java/org/apache/ode/jacob/ValChannelListener.java
----------------------------------------------------------------------
diff --git a/jacob/src/main/java/org/apache/ode/jacob/ValChannelListener.java b/jacob/src/main/java/org/apache/ode/jacob/ValChannelListener.java
new file mode 100644
index 0000000..d95642a
--- /dev/null
+++ b/jacob/src/main/java/org/apache/ode/jacob/ValChannelListener.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.Val
+ */
+
+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.Val} channel type. 
+ * @see org.apache.ode.jacob.Val
+ * @see org.apache.ode.jacob.ValChannel
+ */
+public abstract class ValChannelListener
+    extends org.apache.ode.jacob.ChannelListener<org.apache.ode.jacob.ValChannel>
+    implements org.apache.ode.jacob.Val
+{
+
+    private static final Logger __log = LoggerFactory.getLogger(org.apache.ode.jacob.Val.class);
+
+    protected Logger log() { return __log; } 
+
+    protected ValChannelListener(org.apache.ode.jacob.ValChannel channel) {
+       super(channel);
+    }
+}

http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/jacob/src/main/java/org/apache/ode/jacob/examples/cell/Cell.java
----------------------------------------------------------------------
diff --git a/jacob/src/main/java/org/apache/ode/jacob/examples/cell/Cell.java b/jacob/src/main/java/org/apache/ode/jacob/examples/cell/Cell.java
index 91891e2..617f839 100644
--- a/jacob/src/main/java/org/apache/ode/jacob/examples/cell/Cell.java
+++ b/jacob/src/main/java/org/apache/ode/jacob/examples/cell/Cell.java
@@ -19,14 +19,14 @@
 package org.apache.ode.jacob.examples.cell;
 
 import org.apache.ode.jacob.Val;
-import org.apache.ode.jacob.ap.ChannelType;
+
 
 /**
  * Channel type for a cell. The channel allows reading of and setting the values of a cell.
  * 
  * @jacob.kind
  */
-@ChannelType
+
 public interface Cell  {
 
   /**

http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/jacob/src/main/java/org/apache/ode/jacob/examples/cell/CellChannel.java
----------------------------------------------------------------------
diff --git a/jacob/src/main/java/org/apache/ode/jacob/examples/cell/CellChannel.java b/jacob/src/main/java/org/apache/ode/jacob/examples/cell/CellChannel.java
new file mode 100644
index 0000000..97863f0
--- /dev/null
+++ b/jacob/src/main/java/org/apache/ode/jacob/examples/cell/CellChannel.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.examples.cell.Cell
+ */
+
+package org.apache.ode.jacob.examples.cell;
+
+/**
+ * An auto-generated channel interface for the channel type
+ * {@link org.apache.ode.jacob.examples.cell.Cell}.
+ * @see org.apache.ode.jacob.examples.cell.Cell
+ * @see org.apache.ode.jacob.examples.cell.CellChannelListener
+ */
+public interface CellChannel
+    extends org.apache.ode.jacob.Channel, 
+            org.apache.ode.jacob.examples.cell.Cell
+{}

http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/jacob/src/main/java/org/apache/ode/jacob/examples/cell/CellChannelListener.java
----------------------------------------------------------------------
diff --git a/jacob/src/main/java/org/apache/ode/jacob/examples/cell/CellChannelListener.java
b/jacob/src/main/java/org/apache/ode/jacob/examples/cell/CellChannelListener.java
new file mode 100644
index 0000000..a113be6
--- /dev/null
+++ b/jacob/src/main/java/org/apache/ode/jacob/examples/cell/CellChannelListener.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.examples.cell.Cell
+ */
+
+package org.apache.ode.jacob.examples.cell;
+
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+
+/**
+ * An auto-generated channel listener abstract class for the 
+ * {@link org.apache.ode.jacob.examples.cell.Cell} channel type. 
+ * @see org.apache.ode.jacob.examples.cell.Cell
+ * @see org.apache.ode.jacob.examples.cell.CellChannel
+ */
+public abstract class CellChannelListener
+    extends org.apache.ode.jacob.ChannelListener<org.apache.ode.jacob.examples.cell.CellChannel>
+    implements org.apache.ode.jacob.examples.cell.Cell
+{
+
+    private static final Logger __log = LoggerFactory.getLogger(org.apache.ode.jacob.examples.cell.Cell.class);
+
+    protected Logger log() { return __log; } 
+
+    protected CellChannelListener(org.apache.ode.jacob.examples.cell.CellChannel channel)
{
+       super(channel);
+    }
+}

http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/jacob/src/main/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java
----------------------------------------------------------------------
diff --git a/jacob/src/main/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java
b/jacob/src/main/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java
index 55272b8..a46c906 100644
--- a/jacob/src/main/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java
+++ b/jacob/src/main/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java
@@ -19,7 +19,7 @@
 package org.apache.ode.jacob.examples.eratosthenes;
 
 import org.apache.ode.jacob.SynchChannel;
-import org.apache.ode.jacob.ap.ChannelType;
+
 
 /**
  * DOCUMENTME.
@@ -28,7 +28,7 @@ import org.apache.ode.jacob.ap.ChannelType;
  * @jacob.kind
  * @author Maciej Szefler <a href="mailto:mbs@fivesight.com">mbs</a>
  */
-@ChannelType
+
 public interface NaturalNumberStream {
   public void val(int n, SynchChannel ret);
 }

http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/jacob/src/main/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStreamChannel.java
----------------------------------------------------------------------
diff --git a/jacob/src/main/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStreamChannel.java
b/jacob/src/main/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStreamChannel.java
new file mode 100644
index 0000000..168e7fb
--- /dev/null
+++ b/jacob/src/main/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStreamChannel.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.examples.eratosthenes.NaturalNumberStream
+ */
+
+package org.apache.ode.jacob.examples.eratosthenes;
+
+/**
+ * An auto-generated channel interface for the channel type
+ * {@link org.apache.ode.jacob.examples.eratosthenes.NaturalNumberStream}.
+ * @see org.apache.ode.jacob.examples.eratosthenes.NaturalNumberStream
+ * @see org.apache.ode.jacob.examples.eratosthenes.NaturalNumberStreamChannelListener
+ */
+public interface NaturalNumberStreamChannel
+    extends org.apache.ode.jacob.Channel, 
+            org.apache.ode.jacob.examples.eratosthenes.NaturalNumberStream
+{}

http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/jacob/src/main/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStreamChannelListener.java
----------------------------------------------------------------------
diff --git a/jacob/src/main/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStreamChannelListener.java
b/jacob/src/main/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStreamChannelListener.java
new file mode 100644
index 0000000..99889ea
--- /dev/null
+++ b/jacob/src/main/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStreamChannelListener.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.examples.eratosthenes.NaturalNumberStream
+ */
+
+package org.apache.ode.jacob.examples.eratosthenes;
+
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+
+/**
+ * An auto-generated channel listener abstract class for the 
+ * {@link org.apache.ode.jacob.examples.eratosthenes.NaturalNumberStream} channel type. 
+ * @see org.apache.ode.jacob.examples.eratosthenes.NaturalNumberStream
+ * @see org.apache.ode.jacob.examples.eratosthenes.NaturalNumberStreamChannel
+ */
+public abstract class NaturalNumberStreamChannelListener
+    extends org.apache.ode.jacob.ChannelListener<org.apache.ode.jacob.examples.eratosthenes.NaturalNumberStreamChannel>
+    implements org.apache.ode.jacob.examples.eratosthenes.NaturalNumberStream
+{
+
+    private static final Logger __log = LoggerFactory.getLogger(org.apache.ode.jacob.examples.eratosthenes.NaturalNumberStream.class);
+
+    protected Logger log() { return __log; } 
+
+    protected NaturalNumberStreamChannelListener(org.apache.ode.jacob.examples.eratosthenes.NaturalNumberStreamChannel
channel) {
+       super(channel);
+    }
+}

http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/jacob/src/main/java/org/apache/ode/jacob/examples/synch/SynchPrint.java
----------------------------------------------------------------------
diff --git a/jacob/src/main/java/org/apache/ode/jacob/examples/synch/SynchPrint.java b/jacob/src/main/java/org/apache/ode/jacob/examples/synch/SynchPrint.java
index 3e32e79..8dd01b2 100644
--- a/jacob/src/main/java/org/apache/ode/jacob/examples/synch/SynchPrint.java
+++ b/jacob/src/main/java/org/apache/ode/jacob/examples/synch/SynchPrint.java
@@ -19,7 +19,7 @@
 package org.apache.ode.jacob.examples.synch;
 
 import org.apache.ode.jacob.SynchChannel;
-import org.apache.ode.jacob.ap.ChannelType;
+
 
 /**
  * DOCUMENTME.
@@ -27,7 +27,7 @@ import org.apache.ode.jacob.ap.ChannelType;
  *
  * @author Maciej Szefler <a href="mailto:mbs@fivesight.com">mbs</a>
  */
-@ChannelType
+
 public interface SynchPrint {
   public SynchChannel print(String msg);
 }

http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/jacob/src/main/java/org/apache/ode/jacob/examples/synch/SynchPrintChannel.java
----------------------------------------------------------------------
diff --git a/jacob/src/main/java/org/apache/ode/jacob/examples/synch/SynchPrintChannel.java
b/jacob/src/main/java/org/apache/ode/jacob/examples/synch/SynchPrintChannel.java
new file mode 100644
index 0000000..4b628f2
--- /dev/null
+++ b/jacob/src/main/java/org/apache/ode/jacob/examples/synch/SynchPrintChannel.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.examples.synch.SynchPrint
+ */
+
+package org.apache.ode.jacob.examples.synch;
+
+/**
+ * An auto-generated channel interface for the channel type
+ * {@link org.apache.ode.jacob.examples.synch.SynchPrint}.
+ * @see org.apache.ode.jacob.examples.synch.SynchPrint
+ * @see org.apache.ode.jacob.examples.synch.SynchPrintChannelListener
+ */
+public interface SynchPrintChannel
+    extends org.apache.ode.jacob.Channel, 
+            org.apache.ode.jacob.examples.synch.SynchPrint
+{}

http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/jacob/src/main/java/org/apache/ode/jacob/examples/synch/SynchPrintChannelListener.java
----------------------------------------------------------------------
diff --git a/jacob/src/main/java/org/apache/ode/jacob/examples/synch/SynchPrintChannelListener.java
b/jacob/src/main/java/org/apache/ode/jacob/examples/synch/SynchPrintChannelListener.java
new file mode 100644
index 0000000..eaf4d18
--- /dev/null
+++ b/jacob/src/main/java/org/apache/ode/jacob/examples/synch/SynchPrintChannelListener.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.examples.synch.SynchPrint
+ */
+
+package org.apache.ode.jacob.examples.synch;
+
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+
+/**
+ * An auto-generated channel listener abstract class for the 
+ * {@link org.apache.ode.jacob.examples.synch.SynchPrint} channel type. 
+ * @see org.apache.ode.jacob.examples.synch.SynchPrint
+ * @see org.apache.ode.jacob.examples.synch.SynchPrintChannel
+ */
+public abstract class SynchPrintChannelListener
+    extends org.apache.ode.jacob.ChannelListener<org.apache.ode.jacob.examples.synch.SynchPrintChannel>
+    implements org.apache.ode.jacob.examples.synch.SynchPrint
+{
+
+    private static final Logger __log = LoggerFactory.getLogger(org.apache.ode.jacob.examples.synch.SynchPrint.class);
+
+    protected Logger log() { return __log; } 
+
+    protected SynchPrintChannelListener(org.apache.ode.jacob.examples.synch.SynchPrintChannel
channel) {
+       super(channel);
+    }
+}

http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeCommandsBase.java
----------------------------------------------------------------------
diff --git a/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeCommandsBase.java
b/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeCommandsBase.java
index e39768f..ea5699d 100644
--- a/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeCommandsBase.java
+++ b/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeCommandsBase.java
@@ -19,6 +19,7 @@
 
 package org.apache.ode.karaf.commands;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
@@ -98,17 +99,17 @@ public abstract class OdeCommandsBase extends OsgiCommandSupport {
                 new String[] {String.class.getName(), String.class.getName(), int.class.getName()},

                 timeoutInSeconds);
         if (instances != null) {
-            return instances.getInstanceInfoList().getInstanceInfoList();
+            return Arrays.asList(instances.getInstanceInfoList().getInstanceInfoArray());
         }
         return null;
     }
-    
+
     protected List<TInstanceInfo> getAllInstances(long timeoutInSeconds)
             throws Exception {
         InstanceInfoListDocument instances = invoke(LIST_ALL_INSTANCES, null,
                 null, timeoutInSeconds);
         if (instances != null) {
-            return instances.getInstanceInfoList().getInstanceInfoList();
+            return Arrays.asList(instances.getInstanceInfoList().getInstanceInfoArray());
         }
         return null;
     }
@@ -117,7 +118,7 @@ public abstract class OdeCommandsBase extends OsgiCommandSupport {
             throws Exception {
         ProcessInfoListDocument result = invoke(LIST_ALL_PROCESSES, null, null, timeoutInSeconds);
         if (result != null) {
-            return result.getProcessInfoList().getProcessInfoList();
+            return Arrays.asList(result.getProcessInfoList().getProcessInfoArray());
         }
         return null;
     }
@@ -133,12 +134,12 @@ public abstract class OdeCommandsBase extends OsgiCommandSupport {
         invoke(TERMINATE, new Long[] { iid }, new String[] { Long.class
                 .getName() }, timeoutInSeconds);
     }
-    
+
     protected void suspend(Long iid, long timeoutInSeconds) throws Exception {
         invoke(SUSPEND, new Long[] { iid }, new String[] { Long.class
                 .getName() }, timeoutInSeconds);
     }
-    
+
     protected void resume(Long iid, long timeoutInSeconds) throws Exception {
         invoke(RESUME, new Long[] { iid }, new String[] { Long.class
                 .getName() }, timeoutInSeconds);

http://git-wip-us.apache.org/repos/asf/ode/blob/28c5769e/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java
----------------------------------------------------------------------
diff --git a/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java
b/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java
index a914bfb..4460ec8 100644
--- a/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java
+++ b/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java
@@ -139,7 +139,7 @@ public class OdeListCommand extends OdeCommandsBase {
     private void collectFailedActivities(TScopeInfo scopeInfo, List<TActivityInfo>
bin) {
         Activities acts = scopeInfo.getActivities();
         if (acts != null) {
-            for (TActivityInfo actInfo : acts.getActivityInfoList()) {
+            for (TActivityInfo actInfo : acts.getActivityInfoArray()) {
                 if (actInfo.getStatus() == TActivityStatus.FAILURE) {
                     bin.add(actInfo);
                 }
@@ -147,7 +147,7 @@ public class OdeListCommand extends OdeCommandsBase {
         }
         TScopeInfo.Children children = scopeInfo.getChildren();
         if (children != null) {
-            for (TScopeRef child : children.getChildRefList()) {
+            for (TScopeRef child : children.getChildRefArray()) {
                 TScopeInfo childScopeInfo = getScopeInfo(child);
                 if (childScopeInfo != null) {
                     collectFailedActivities(childScopeInfo, bin);


Mime
View raw message