Merge branch 'define_getFieldOrder'

ymnk · Dec 5, 2013 · 730c563 · 730c563
2 parents cde963c + d54f284
commit 730c563
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 12 deletions.
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>com.jcraft</groupId>
   <artifactId>jsch.agentproxy.examples</artifactId>
-  <version>0.0.6</version>
+  <version>0.0.7</version>
   <name>examples to demonstrate how to use jsch-agent-proxy</name>
 
   <dependencies>

diff --git a/jsch-agent-proxy-connector-factory/pom.xml b/jsch-agent-proxy-connector-factory/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.6</version>
+    <version>0.0.7</version>
   </parent>
 
   <artifactId>jsch.agentproxy.connector-factory</artifactId>

diff --git a/jsch-agent-proxy-core/pom.xml b/jsch-agent-proxy-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.6</version>
+    <version>0.0.7</version>
   </parent>
 
   <artifactId>jsch.agentproxy.core</artifactId>

diff --git a/jsch-agent-proxy-jsch/pom.xml b/jsch-agent-proxy-jsch/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.6</version>
+    <version>0.0.7</version>
   </parent>
 
   <artifactId>jsch.agentproxy.jsch</artifactId>

diff --git a/jsch-agent-proxy-pageant/pom.xml b/jsch-agent-proxy-pageant/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.6</version>
+    <version>0.0.7</version>
   </parent>
 
   <artifactId>jsch.agentproxy.pageant</artifactId>

diff --git a/...nt-proxy-pageant/src/main/java/com/jcraft/jsch/agentproxy/connector/PageantConnector.java b/...nt-proxy-pageant/src/main/java/com/jcraft/jsch/agentproxy/connector/PageantConnector.java
@@ -48,6 +48,9 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 import com.sun.jna.platform.win32.Kernel32;
 import com.sun.jna.platform.win32.WinNT;
 
+import java.util.Arrays;
+import java.util.List;
+
 public class PageantConnector implements Connector {
 
   private User32 libU = null;
@@ -90,12 +93,20 @@ public class COPYDATASTRUCT32 extends Structure {
     public int dwData;
     public int cbData;
     public Pointer lpData;
+
+    protected List getFieldOrder() {
+      return Arrays.asList(new String[] { "dwData", "cbData", "lpData" });
+    }
   }
 
   public class COPYDATASTRUCT64 extends Structure {
     public int dwData;
     public long cbData;
     public Pointer lpData;
+
+    protected List getFieldOrder() {
+      return Arrays.asList(new String[] { "dwData", "cbData", "lpData" });
+    }
   }
 
   public void query(Buffer buffer) throws AgentProxyException {

diff --git a/jsch-agent-proxy-sshagent/pom.xml b/jsch-agent-proxy-sshagent/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.6</version>
+    <version>0.0.7</version>
   </parent>
 
   <artifactId>jsch.agentproxy.sshagent</artifactId>

diff --git a/jsch-agent-proxy-sshj/pom.xml b/jsch-agent-proxy-sshj/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.6</version>
+    <version>0.0.7</version>
   </parent>
 
   <artifactId>jsch.agentproxy.sshj</artifactId>

diff --git a/jsch-agent-proxy-svnkit-trilead-ssh2/pom.xml b/jsch-agent-proxy-svnkit-trilead-ssh2/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.6</version>
+    <version>0.0.7</version>
   </parent>
 
   <artifactId>jsch.agentproxy.svnkit-trilead-ssh2</artifactId>

diff --git a/jsch-agent-proxy-usocket-jna/pom.xml b/jsch-agent-proxy-usocket-jna/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.6</version>
+    <version>0.0.7</version>
   </parent>
 
   <artifactId>jsch.agentproxy.usocket-jna</artifactId>

diff --git a/...proxy-usocket-jna/src/main/java/com/jcraft/jsch/agentproxy/usocket/JNAUSocketFactory.java b/...proxy-usocket-jna/src/main/java/com/jcraft/jsch/agentproxy/usocket/JNAUSocketFactory.java
@@ -38,6 +38,8 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 import com.sun.jna.Structure;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
 
 public class JNAUSocketFactory implements USocketFactory {
 
@@ -54,6 +56,10 @@ public interface CLibrary extends Library {
   public static class SockAddr extends Structure {
     public short sun_family;
     public byte[] sun_path;
+
+    protected List getFieldOrder() {
+      return Arrays.asList(new String[] { "sun_family", "sun_path" });
+    }
   }
 
   public JNAUSocketFactory() throws AgentProxyException {

diff --git a/jsch-agent-proxy-usocket-junixsocket/pom.xml b/jsch-agent-proxy-usocket-junixsocket/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.6</version>
+    <version>0.0.7</version>
   </parent>
 
   <artifactId>jsch.agentproxy.usocket-junixsocket</artifactId>

diff --git a/jsch-agent-proxy-usocket-nc/pom.xml b/jsch-agent-proxy-usocket-nc/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.6</version>
+    <version>0.0.7</version>
   </parent>
 
   <artifactId>jsch.agentproxy.usocket-nc</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>com.jcraft</groupId>
   <artifactId>jsch.agentproxy</artifactId>
-  <version>0.0.6</version>
+  <version>0.0.7</version>
   <packaging>pom</packaging>
   <name>jsch-agent-proxy: a parent of modules</name>