-n

Move JCA support out of the core and to an extension that gets loaded as a plugin.

lib/README.html

@@ -26,9 +26,7 @@ <h2>External Jar Files</h2>
 <table class="data">
 <caption>Third Party Jar Files</caption>
 <tr> <th>File</th> <th>Version</th> <th>External Source</th> <th>Redistribution*</th> <th>Comment</th> </tr>
-<tr> <td>caj.jar</td> <td class="numeric">1.1.5</td> <td><a href="http://caj.cosylab.com/" target="_blank">Cosylab CAJ</a></td> <td class="granted">Granted</td> <td></td> </tr>
 <tr> <td>Jama.jar</td> <td class="numeric">1.0.2</td> <td><a href="http://math.nist.gov/javanumerics/jama/" target="_blank">JAMA (NIST)</a></td> <td class="okay">Okay</td> <td>Public Domain</td> </tr>
-<tr> <td>jca.jar</td> <td class="numeric">2.3.2</td> <td><a href="http://jca.cosylab.com/downloads.html" target="_blank">Cosylab JCA</a></td> <td class="granted">Granted</td> <td></td> </tr>
 <tr> <td>jsci-core.jar</td> <td class="numeric">1.1</td> <td><a href="http://jsci.sourceforge.net/">JSci</a></td> <td><a href="http://jsci.sourceforge.net/LICENSE" target="_blank">Restricted</a></td> <td></td> </tr>
 </table>
 <div style="font-size: small;">*Redistribution of <span class="granted" style="font-style: italic;">Granted</span> means that we have obtained permission from the maintainer of the jar file to redistribute it with Open XAL through our <a href="https://sourceforge.net/projects/xaldev/" target="_blank">Open XAL project</a> on Source Forge. Redistribution marked <span style="font-style: italic;" class="okay">Okay</span> means that it should be fine to redistribute based upon my best effort to interpret the published license.</div>

src/xal/ca/ChannelFactory.java

@@ -9,6 +9,7 @@
 import xal.tools.transforms.ValueTransform;
 
 import java.util.*;
+import java.lang.reflect.Method;
 
 
 /**
@@ -135,7 +136,16 @@ static ChannelSystem defaultSystem() {
 	 * @return a new channel factory
 	 */
     static protected ChannelFactory newFactory() {
-        return new xal.jca.JcaChannelFactory();
+		try {
+			// effectively returns ChannelFactoryPlugin.getChannelFactoryInstance()
+			final Class<?> pluginClass = Class.forName( "xal.ca.ChannelFactoryPlugin" );
+			final Method creatorMethod = pluginClass.getMethod( "getChannelFactoryInstance" );
+			return (ChannelFactory)creatorMethod.invoke( null );
+		}
+		catch( Exception exception ) {
+			exception.printStackTrace();
+			throw new RuntimeException( "Failed to load the ChannelFactoryPlugin: " + exception.getMessage() );
+		}
     }