Code cleanup, much more doc, split packaged xml & jave examples.

Author: bjeffrie

README.md

@@ -10,6 +10,7 @@ This repository stores a variety of examples demonstrating how to use the Oracle
 | [optimizer](./optimizer) | Oracle Optmizer and Optimizer Stats examples |
 | [python](./python) | Python based examples |
 | [sql](./sql) | SQL based examples |
+| [sqldeveloper](./sqldeveloper) | [SQL Developer](http://www.oracle.com/technetwork/developer-tools/sql-developer/) Examples |
 
 ## Documentation
 You can find the online documentation of the Oracle Database under [docs.oracle.com/en/database/](http://docs.oracle.com/en/database/)

sqldeveloper/ - Copy.classpath

@@ -1,11 +1,9 @@
-# SQL Developer Examples
+# [SQL Developer](http://www.oracle.com/technetwork/developer-tools/sql-developer/) Examples
 ## Extensions
 You can add new folders and nodes to navigators, new actions on objects (*or sets of them*), and new editors or viewers.
 
 Depending on requirements, this can be done in either XML or java and deployed by simply copying an XML file to the appropriate directory, or creating an extension jar -- or *check for updates* bundle for XML and/or java.
 
-*NOTE:* There are some "global" properties in buildtools/build.properties you should configure before moving on to:
-
 ### Contents
 
 * ["Simple" User Extensions (XML)](xml)

sqldeveloper/ - Copy.project

@@ -5,7 +5,7 @@
 # Where sqldev lives. The directory that sqldeveloper/bin is in.
 # This is where the builds will deploy the extension
 #      and where we can find our dependencies 
-sqldev.dir=D:/sqldeveloper-4.2.0.16.356.1154-x64/sqldeveloper
+sqldev.dir=D:/sqldeveloper-4.2.0.17.089.1709/sqldeveloper
 
 # Information about the company or person creating the extension
 extension.owner=Oracle Examples

sqldeveloper/extension/README.md

@@ -16,8 +16,8 @@ limitations under the License.
 -->
 
 <project name="extension">
-	<import file="./properties.xml"/>
+<!--    <import file="./properties.xml"/>
     <import file="./classpaths.xml" />
-    <import file="./includes.xml" />
+    <import file="./includes.xml" /> -->
     <import file="./targets.xml" />
 </project>

sqldeveloper/extension/build.properties

@@ -16,6 +16,8 @@ limitations under the License.
 -->
 
 <project name="classpaths">
+	<import file="./properties.xml"/>
+	
 <!-- build classpaths -->
 	<path id="buildutils.task.classpath">
 		<fileset dir="${buildutils.dir}" includes="buildutils.jar" />

sqldeveloper/extension/buildtools/ant/build.xml

@@ -17,6 +17,7 @@ limitations under the License.
 
 <project name="includes">
 	<import file="./buildutils.xml"/>
+    <import file="./classpaths.xml"/>
 
 	<!-- This classpath is considered the 'base' compile classpath and is shared by all modules. -->
     <path id="compile.classpath">
@@ -52,7 +53,7 @@ limitations under the License.
     </target>
 
 	<target name="resgen-inc" depends="buildutils-task" description="Generate java files for internationalized strings.">
-        <taskdef name="resgen" classname="oracle.dbtools.resgen.ResGenTask" classpath="buildutils.task.classpath" />
+        <taskdef name="resgen" classname="oracle.dbtools.resgen.ResGenTask" classpathref="buildutils.task.classpath" />
         <!-- make generated source dir  -->
         <mkdir dir="${gen-src.dir}" />
         <resgen inputfile="resfiles.properties"  sourceroot="src" outputroot="${built}/gen-src" >
@@ -113,7 +114,7 @@ limitations under the License.
         </javac>
     </target>
 
-	<property name="extension.xml" value="${extension.xml}"/>
+	<property name="extension.xml" value="${built}/extension.xml"/>
 	<target name="extension-inc">
         <!-- copy the extension.xml to the stage area -->
         <copy file="etc/extension.xml" tofile="${extension.xml}" />

sqldeveloper/extension/buildtools/ant/classpaths.xml

@@ -20,7 +20,6 @@ limitations under the License.
 	<dirname property="ant.build.dir" file="${ant.file.props}"/>
 	<property name="root.directory" value="${ant.build.dir}/../.."/>
     <property name="buildutils.dir" value="${root.directory}/buildtools/buildutils" />
-	<property name="buildutils.jar" value="${buildutils.dir}/buildutils.jar"/>
 
 <!-- master properties -->
 	<property file="${root.directory}/build.properties" />
@@ -55,6 +54,7 @@ limitations under the License.
 	<property name="built.destination.file" value="${built}/${extension.filename}"/>
 
 	<property name="jar.manifest.template" value="${built}/manifest.template" />
+    <property name="module.default.exported.packages" value=""/>
 
 	<property name="osgi.bundle.classpath" value="." />
 	<property name="osgi.exported.jars" value="${built.destination.file}"/>

sqldeveloper/extension/buildtools/ant/includes.xml

@@ -17,9 +17,10 @@ limitations under the License.
 
 <project name="targets">
 <!-- The basic build flow outline. Most of the nasty bits are in includes.xml -->
+	<import file="./includes.xml"/>
 
 	<!-- create a build number file if it doesn't exist, so that the build shares a consistent build number -->
-	<target name="-create-build-number" unless="build.number.exists">
+	<target name="create-build-number" unless="build.number.exists">
 		<!-- new build number format -->
 		<tstamp>
 			<format property="ts.number" pattern="yy.DDD.HHmm" locale="en" />
@@ -38,7 +39,7 @@ limitations under the License.
 	<target name="init-version">
 		<!-- use antcall to call -create-build-number instead of a dependency so that we can 
 		     force the reevaluation of the build.number.exists property -->
-		<antcall target="-create-build-number" inheritall="false"/>
+		<antcall target="create-build-number" inheritall="false"/>
     	<property file="${build.number.filename}" prefix="build"/>
     	<property name="version.full" value="${extension.version}.${build.number}" />
 	</target>