SQLDeveloper example extension ConnectionHelper

o Add info on the ConnectionHelperClient to ConnectionHelper's readme
o Added ConnectionHelperClient.jar to the cfu bundle
o Make sure client designates Main-Class in the jar manifest (distinction between building locally and building from ConnectionHelper which doesn't call deploy)

Author: bjeffrie

sqldeveloper/extension/java/ConnectionHelper/README.md

@@ -1,6 +1,8 @@
 # SQL Developer Examples
 ## ConnectionHelper
-Optionally accept connection info from the command line and/or on a [SocketServer](https://docs.oracle.com/javase/tutorial/networking/sockets/clientServer.html)
+Optionally accept connection info from the command line and/or on a [SocketServer](https://docs.oracle.com/javase/tutorial/networking/sockets/clientServer.html). For use with the socket server, see also the [ConnectionHelperClient](../ConnectionHelperClient/README.md) example.
+
+*Note: The cfu bundle includes the client. It can be found in <sqldev_home>sqldeveloper/extension/oracle.db.example.sqldeveloper.extension.connectionHelper/ConnectionHelperClient.jar*
 
 ### Command Line
 sqldeveloper -_conName_**=**_user_\[**/**\[_pw_]]**@**_host_**:**_port_(**:**_sid_|**/**_svc_)\[**#**_role_]

sqldeveloper/extension/java/ConnectionHelper/build.properties

@@ -1,6 +1,6 @@
 extension.id=oracle.db.example.sqldeveloper.extension.connectionHelper
 extension.name=Connection Helper
-extension.descr=Example to accept connection info from the command line (or via a SocketServer?)
+extension.descr=Example to accept connection info from the command line or via a SocketServer
 extension.version=20.1.0
 extension.resources=oracle.db.example.sqldeveloper.extension.connectionHelper.ConnectionHelperResources
 

sqldeveloper/extension/java/ConnectionHelper/build.xml

@@ -1,6 +1,23 @@
 <?xml version="1.0" encoding="windows-1252" ?>
 <project name="ConnectionHelper" default="_deploy">
-    <!-- imports -->
+	<!-- This one needs direct link to the project page for doc-->
+	<property name="extension.owner.url" value="https://github.com/oracle/oracle-db-examples/tree/master/sqldeveloper/extension/java/ConnectionHelper" />
+
+	<!-- override _cfu to include the client. -->
+    <property name="ch.client.dir" value="${basedir}/../ConnectionHelperClient" />
+    <property name="ch.client.jar" value="ConnectionHelperClient.jar" />
+    <target name="_cfu" depends="clean,jar,manifest" description="Create CFU bundle">
+        <echo message="Need to build ConnectionHelperClient..." />
+        <ant dir="${ch.client.dir}" target="clean" inheritAll="false" />
+        <ant dir="${ch.client.dir}" target="jar" inheritAll="false" />
+        <echo message="and create a local built/lib directory..." />
+        <mkdir dir="${built}/lib" />
+        <echo message="to copy the client jar before building the cfu bundle." />
+        <copy file="${ch.client.dir}/built/${ch.client.jar}" tofile="${built}/lib/${ch.client.jar}" />
+        <antcall target="cfu-inc" inheritAll="true" inheritRefs="true" />
+    </target>
+
+	<!-- imports -->
 	<import file="../../buildtools/ant/build.xml" />
 
     <!-- bundle dependencies -->

sqldeveloper/extension/java/ConnectionHelperClient/build.xml

@@ -14,10 +14,11 @@
     -->
 
     <target name="jar" depends="compile" description="Create the extension jar">
-        <jar basedir="${built}/classes" destfile="${built}/${extension.filename}" excludes="**/.data/*" />
+        <jar basedir="${built}/classes" destfile="${built.destination.file}" excludes="**/.data/*" />
 		<manifest file="${jar.manifest.template}" mode="update">
 			<attribute name="Main-Class" value="ConnectionHelperClient" />
 		</manifest>
+        <jar destfile="${built.destination.file}" update="true" manifest="${jar.manifest.template}" />
     </target>
     <target name="deploy" depends="jar, manifest" description="Deploy plugins directory">
         <copy file="${built}/${extension.filename}" tofile="${ide.home}/sqldeveloper/lib/${extension.filename}" />