Removed jar from repository - pom will now build an artifact with

everything needed to run.
improved jdbc.js (simplier + can handle path set to look for libs)

Author: vlkong

.gitignore

@@ -11,4 +11,7 @@ external_libs/
 # but some examples might have eclipse projects in them
 /.classpath
 /.project
-/.settings/
+/.settings/
+
+# ignore jars in examples
+examples/**/*.jar

examples/studio_integration/jdbc.js

@@ -8,31 +8,37 @@
 // Before running this sample, please review and setup the following
 //
 
-// OPL_JDBC_DRIVER points to the jar for the jdbc driver you want to use.
-var jdbc_driver = IloOplGetEnv("OPL_JDBC_DRIVER");
-if (! jdbc_driver ) {
-	jdbc_driver = "../../external_libs/mssql-jdbc-7.2.2.jre8.jar";  // default for this project
-}
+// EDIT: you want to change this for your actual driver
+var jdbc_driver = "mssql-jdbc-7.4.1.jre8.jar"
+// EDIT: specify where to look for the jdbc driver. Default is in . (besides this .js script) and in ../../external_libs
+var jdbc_driver_path = ".;../../external_libs"
 
-// OPL_JDBC_LIBS points to the directory containing the library needed for this sample.
-// You want to put jdbc-custom-data-source.jar there.
-var libs = IloOplGetEnv("OPL_JDBC_LIBS");
-if (! libs ) {
-	libs = "../../lib";  // default value use the lib at the root of this project
-}
 
+// EDIT: specfify where jdbc-custom-data-source is of the github project.
+// default is to look in . and ../../lib
+var libs = ".;../../lib";
 
 //
 // From this point, nothing is to be edited.
 //
 
-// Update this to point to your jdbc driver.
-IloOplImportJava(jdbc_driver)
-
+// import all drivers in jdbc_driver, separated by ;. This allows to be stored at different default locations.
+var drivers = jdbc_driver_path.split(";");
+for (var i=0; i < drivers.length; i++) {
+	IloOplImportJava(drivers[i] + "/" + jdbc_driver)
+}
 
+// load the driver specified by environment variable if this exists.
+var jdbc_driver_env = IloOplGetEnv("OPL_JDBC_DRIVER");
+if ( jdbc_driver_env ) {
+	IloOplImportJava(jdbc_driver_env);
+}
 
 // The jar containing the jdbc custom data source
-IloOplImportJava(libs +  "/jdbc-custom-data-source.jar");
+var lib_locations = libs.split(";");
+for (var i=0; i < lib_locations.length; i++) {
+	IloOplImportJava(lib_locations[i] +  "/jdbc-custom-data-source.jar");
+}
 
 function JDBCConnector(url) {
 	// Now create JdbcConfiguration

lib/jdbc-custom-data-source.jar

@@ -7,19 +7,19 @@
 
 	<groupId>com.ibm.optim.opl</groupId>
 	<artifactId>jdbc-custom-data-source</artifactId>
-	<version>1.0-SNAPSHOT</version>
+	<version>1.2-master</version>
 	<packaging>jar</packaging>
 
 	<properties>
 		<jdk.version>1.7</jdk.version>
-		<cplex_home>${env.CPLEX_STUDIO_DIR128}</cplex_home>
-		<cplex_version>12.8.0.0</cplex_version>
+		<cplex_home>${env.CPLEX_STUDIO_DIR129}</cplex_home>
+		<cplex_version>12.9.0.0</cplex_version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<!-- To install oplall.jar on your machine, do something like:
-			mvn install:install-file "-Dfile=%CPLEX_STUDIO_DIR128%\opl\lib\oplall.jar" -DgroupId=com.ibm.ilog.optim -DartifactId=oplall -Dversion=12.8.0.0 -Dpackaging=jar
+			mvn install:install-file "-Dfile=%CPLEX_STUDIO_DIR129%\opl\lib\oplall.jar" -DgroupId=com.ibm.ilog.optim -DartifactId=oplall -Dversion=12.9.0.0 -Dpackaging=jar
 			-->
 			<groupId>com.ibm.ilog.optim</groupId>
 			<artifactId>oplall</artifactId>
@@ -62,11 +62,30 @@
 					<archive>
 						<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
 						<manifestEntries>
-							<Specification-Version>${version}</Specification-Version>
+							<Specification-Version>${project.version}</Specification-Version>
 						</manifestEntries>
 					</archive>
 				</configuration>
 			</plugin>
+			
+			<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <appendAssemblyId>true</appendAssemblyId>
+                            <descriptors>
+                                <descriptor>src/main/assembly/distrib.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 		</plugins>
 	</build>
 </project>

pom.xml

@@ -0,0 +1,30 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" 
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <!--  This is the assembly descriptor for the whole docplex project (mp+cp) -->
+  
+  <id>opl_jdbc</id>
+  <baseDirectory>/</baseDirectory>
+  <formats>
+    <format>zip</format>
+  </formats>
+  
+  <includeBaseDirectory>false</includeBaseDirectory>component>
+  
+  <fileSets>
+    <fileSet>
+      <directory>${project.basedir}/examples/studio_integration</directory>
+      <outputDirectory>/opl_jdbc</outputDirectory>
+      <includes>
+        <include>jdbc.js</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  
+  <files>
+	  <file>
+		<source>target/${project.artifactId}-${project.version}.jar</source>
+		<destName>opl_jdbc/${project.artifactId}.jar</destName>
+	  </file>
+  </files>
+ </assembly>

src/main/assembly/distrib.xml

@@ -1,3 +1,2 @@
 Specification-Title: JDBC custom data source for OPL
-Specification-Version: 1.1
 Specification-Vendor: IBM