[Mulgara-svn] r1549 - in trunk/src/jar/descriptor: . src/java/org/mulgara/descriptor src/java/org/mulgara/descriptor/test
pag at mulgara.org
pag at mulgara.org
Wed Feb 25 18:57:23 UTC 2009
Author: pag
Date: 2009-02-25 10:57:22 -0800 (Wed, 25 Feb 2009)
New Revision: 1549
Modified:
trunk/src/jar/descriptor/build.xml
trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DeployServlet.java
trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/Descriptor.java
trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorElement.java
trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorException.java
trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorFactory.java
trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorServlet.java
trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorUtil.java
trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorUtility.java
trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/PIErrorHandler.java
trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/test/DescriptorUtilServiceTest.java
Log:
Fixed warnings by adding generics. Updated to compiling with 1.5 to allow for generics
Modified: trunk/src/jar/descriptor/build.xml
===================================================================
--- trunk/src/jar/descriptor/build.xml 2009-02-25 18:54:43 UTC (rev 1548)
+++ trunk/src/jar/descriptor/build.xml 2009-02-25 18:57:22 UTC (rev 1549)
@@ -222,7 +222,7 @@
<mkdir dir="${client.obj.dir}/classes"/>
<!-- compile wsdl client -->
- <javac destdir="${client.obj.dir}/classes" debug="on" source="1.4">
+ <javac destdir="${client.obj.dir}/classes" debug="on" source="1.5">
<classpath refid="descriptor-classpath"/>
Modified: trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DeployServlet.java
===================================================================
--- trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DeployServlet.java 2009-02-25 18:54:43 UTC (rev 1548)
+++ trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DeployServlet.java 2009-02-25 18:57:22 UTC (rev 1549)
@@ -36,23 +36,14 @@
// Servlet packages
import javax.servlet.*;
import javax.servlet.http.*;
-import javax.xml.parsers.*;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.stream.*;
// Third party packages
import org.apache.log4j.*;
// Debugging writer
-import org.apache.soap.util.xml.DOM2Writer;
import org.mulgara.itql.ItqlInterpreterBean;
import org.mulgara.query.QueryException;
-import org.mulgara.server.ServerInfo;
-// DOM
-import org.w3c.dom.*;
-
/**
* Deploys descriptors.
*
@@ -75,11 +66,13 @@
*/
public class DeployServlet extends HttpServlet {
+ /** Serialization ID */
+ private static final long serialVersionUID = 8322549888804327301L;
+
/**
* the logging category to log to
*/
- private final static Logger log =
- Logger.getLogger(DeployServlet.class.getName());
+ private final static Logger log = Logger.getLogger(DeployServlet.class.getName());
/**
* Get line separator.
@@ -92,7 +85,7 @@
private static String hostname = null;
/**
- * Description of the Field
+ * Array of deployed descriptors
*/
private static URL[] descriptorsArray = {};
@@ -105,20 +98,18 @@
/**
* Deploys descriptors
*
- * @param req PARAMETER TO DO
- * @param res PARAMETER TO DO
- * @throws ServletException EXCEPTION TO DO
- * @throws IOException EXCEPTION TO DO
+ * @param req The HTTP request
+ * @param res The HTTP response
+ * @throws ServletException An error in running the servlet
+ * @throws IOException An error reading from the request, or writing a response
*/
- public void doGet(HttpServletRequest req,
- HttpServletResponse res) throws ServletException, IOException {
+ @SuppressWarnings("unchecked")
+ public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
res.setContentType("text/plain");
- PrintWriter out = res.getWriter();
-
// Extract the parameters
- Enumeration enumeration = req.getParameterNames();
+ Enumeration<String> enumeration = (Enumeration<String>)req.getParameterNames();
// commands
boolean deployLocalDescriptors = false;
@@ -136,34 +127,21 @@
String[] values = req.getParameterValues(name);
if (values != null) {
-
for (int i = 0; i < values.length; i++) {
-
if (log.isDebugEnabled()) {
-
log.debug("name :" + name + " (" + i + ") : " + values[i]);
}
-
- // if
}
-
- // for
}
- // if
- if (name.equals("deployLocalDescriptors") &&
- values[0].equals("true")) {
-
+ if (name.equals("deployLocalDescriptors") && values[0].equals("true")) {
deployLocalDescriptors = true;
- }
- else if (name.equals("clearLocalDescriptors") &&
- values[0].equals("true")) {
-
+ } else if (name.equals("clearLocalDescriptors") &&
+ values[0].equals("true")) {
clearLocalDescriptors = true;
}
}
- // while
// for our HTML result
StringBuffer result = new StringBuffer();
@@ -179,13 +157,9 @@
res.getWriter().println(result);
try {
+ if (log.isDebugEnabled()) log.debug("about to execute query: " + query.toString());
- if (log.isDebugEnabled()) {
- log.debug("about to execute query: " + query.toString());
- }
-
-
// send statements to the database
ItqlInterpreterBean bean = null;
StringBuffer beanResponseBuffer = null;
@@ -208,45 +182,30 @@
String beanResponse = beanResponseBuffer.toString();
// Create Descriptor Factory
- if (factory == null) {
- factory = DescriptorFactory.getInstance();
- }
+ if (factory == null) factory = DescriptorFactory.getInstance();
// clear the cache
factory.clearDescriptorCache();
// write result to response
- res.getWriter().println("Response from server: " +
- beanResponse);
- }
- catch (QueryException qe) {
-
+ res.getWriter().println("Response from server: " + beanResponse);
+ } catch (QueryException qe) {
throw new ServletException("Query error", qe);
- }
- catch (SQLException se) {
-
+ } catch (SQLException se) {
throw new ServletException("SQL error", se);
- }
- catch (Exception ge) {
-
+ } catch (Exception ge) {
throw new ServletException("General Exception", ge);
}
- }
- else {
-
+ } else {
// redirect to the error.jsp page with some needed params
res.sendRedirect("error.jsp&message=NO_VALID_PARAMS");
}
- }
- else {
-
+ } else {
// No parameters
// redirect to the error.jsp page with some needed params
res.sendRedirect("error.jsp&message=NO_PARAMS");
}
- }
- catch (DescriptorException de) {
-
+ } catch (DescriptorException de) {
throw new ServletException("Descriptor Problem", de);
}
}
@@ -266,11 +225,7 @@
// get the hostname from the descriptor Servlet
if (hostname == null) {
hostname = org.mulgara.server.ServerInfo.getBoundHostname();
-
- if (log.isDebugEnabled()) {
- log.debug("Hostname is set from ServerInfo to " + hostname);
- }
-
+ if (log.isDebugEnabled()) log.debug("Hostname is set from ServerInfo to " + hostname);
}
// Auto deploy the descriptors
@@ -281,20 +236,14 @@
// build the deploy query;
StringBuffer query = buildDeployQuery(true);
- if (log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) log.debug("about to execute query: " + query.toString());
- log.debug("about to execute query: " + query.toString());
- }
-
// send statements to the database
String beanResponse = bean.executeQueryToString(query.toString());
// Create Descriptor Factory
- if (factory == null) {
+ if (factory == null) factory = DescriptorFactory.getInstance();
- factory = DescriptorFactory.getInstance();
- }
-
// clear the cache
factory.clearDescriptorCache();
} catch (Exception e){
@@ -312,64 +261,50 @@
/**
* Returns an array of Local Descriptor URLs
*
- * @param request PARAMETER TO DO
* @param resources PARAMETER TO DO
* @return The LocalDescriptorURLs value
* @throws DescriptorException EXCEPTION TO DO
*/
- private URL[] getLocalDescriptorURLs(List resources) throws DescriptorException {
+ private URL[] getLocalDescriptorURLs(List<String> resources) throws DescriptorException {
- Vector descriptors = new Vector();
+ Vector<URL> descriptors = new Vector<URL>();
// Figure out our URL
String URL2Here = Descriptor.DEFAULT_DESCRIPTOR_PROTOCOL +
org.mulgara.server.ServerInfo.getBoundHostname() +
":" + org.mulgara.server.ServerInfo.getHttpPort() + "/webservices/";
- for (Iterator it = resources.iterator(); it.hasNext(); ) {
+ for (String currResource: resources) {
- String currResource = (String) it.next();
-
// get the descriptor resource from this context
try {
-
URL defaultDir = getServletContext().getResource(currResource);
-
log.info("default dir is " + defaultDir);
//if (defaultDir != null) {
File dfile = null;
-
try {
-
// Now make a file out of it..
// Use the URI constructor to assist with Windows 2000/NT
// issues.
dfile = new File(new URI(defaultDir.toString()));
-
} catch (java.net.URISyntaxException use) {
-
throw new DescriptorException("Unable to construct URI to default" +
" Descriptors at directory location "+ defaultDir );
}
// check if its a directory
if (dfile.isDirectory()) {
-
log.debug("Entering " + defaultDir);
-
// go thru all files in dir, TODO descend into dirs if necessary
File[] dfiles = dfile.listFiles();
for (int i = 0; i < dfiles.length; i++) {
-
log.debug("Testing " + dfiles[i].getName());
-
// test if this file is a file
if (dfiles[i].isFile()) {
-
//String urlString = URL2Here + "descriptors/default/" + dfiles[i].getName();
String urlString =
URL2Here + currResource.substring(1, currResource.length()) +
@@ -385,23 +320,17 @@
descriptors.add(url);
}
}
- }
- else {
-
- throw new DescriptorException("Path to default descriptors (" +
- defaultDir + ") is NOT a directory!");
+ } else {
+ throw new DescriptorException("Path to default descriptors (" + defaultDir + ") is NOT a directory!");
}
//} // if defaultDir
+ } catch (java.net.MalformedURLException mue) {
+ throw new DescriptorException("Unable to construct URL to default Descriptors!");
}
- catch (java.net.MalformedURLException mue) {
-
- throw new DescriptorException("Unable to construct URL to default" +
- " Descriptors!");
- }
}
// return as an array
- return (URL[]) descriptors.toArray(descriptorsArray);
+ return descriptors.toArray(descriptorsArray);
}
@@ -426,15 +355,11 @@
// end if
// get server name
- String serverURIString =
- modelURIString.substring(0, modelURIString.indexOf('#'));
+ String serverURIString = modelURIString.substring(0, modelURIString.indexOf('#'));
// log it
- if (log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) log.debug("Server URI is " + serverURIString);
- log.debug("Server URI is " + serverURIString);
- }
-
// end if
// present security credentials
@@ -448,15 +373,14 @@
// when clearing, create,drop,create to avoid exceptions
if (clearLocalDescriptors) {
- query.append(
- "# create,drop,create avoids Graph not found exceptions" + eol);
+ query.append("# create,drop,create avoids Graph not found exceptions" + eol);
query.append("create <" + modelURIString + ">;" + eol);
query.append("drop <" + modelURIString + ">;" + eol);
query.append("create <" + modelURIString + ">;" + eol);
}
// create load statements
- List resources = new Vector();
+ List<String> resources = new Vector<String>();
resources.add("/descriptor/descriptors/default/");
resources.add("/descriptor/descriptors/vcard/");
resources.add("/descriptor/descriptors/test/");
@@ -465,9 +389,7 @@
query.append("# Deploy Internal Descriptors " + eol);
for (int i = 0; i < descriptors.length; i++) {
-
log.debug("Descriptor URL: " + descriptors[i].toString());
-
query.append("load <");
query.append(descriptors[i].toString());
query.append("> into <");
@@ -477,10 +399,9 @@
// end transaction
query.append("set autocommit on;" + eol);
-/*
+ /*
// send to response
result.append(eol + query + eol);
-
result.append("\n Sending Statements to Mulgara Database..." + eol);
*/
Modified: trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/Descriptor.java
===================================================================
--- trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/Descriptor.java 2009-02-25 18:54:43 UTC (rev 1548)
+++ trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/Descriptor.java 2009-02-25 18:57:22 UTC (rev 1549)
@@ -30,7 +30,6 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import java.util.regex.*;
import javax.xml.parsers.*;
import javax.xml.transform.*;
@@ -144,11 +143,6 @@
private static Document stubDoc = null;
/**
- * used in Vector.toArray(p)
- */
- private static Param[] p = new Param[] {};
-
- /**
* Description of the Field
*/
private static URI descriptorModelURI = null;
@@ -156,12 +150,12 @@
/**
* Description of the Field
*/
- private static Map paramMap = null;
+ private static Map<URL,List<Param>> paramMap = null;
/**
* map if our mime types
*/
- private static Map mimeMap = null;
+ private static Map<URL,MimeType> mimeMap = null;
/**
* Description of the Field
@@ -255,7 +249,7 @@
if (documentBuilderFactory == null) {
- documentBuilderFactory = documentBuilderFactory.newInstance();
+ documentBuilderFactory = DocumentBuilderFactory.newInstance();
}
if (documentBuilder == null) {
@@ -486,7 +480,7 @@
public MimeType getMimeType() throws DescriptorException {
// we will be in here, or exception would have been thrown earlier
- return (MimeType) mimeMap.get(url);
+ return mimeMap.get(url);
}
/**
@@ -494,8 +488,7 @@
*
* @return The Params value
*/
- public List getParams() {
-
+ public List<Param> getParams() {
return getParams(this.url);
}
@@ -505,17 +498,15 @@
* @param url PARAMETER TO DO
* @return The Params value
*/
- public List getParams(URL url) {
+ public List<Param> getParams(URL url) {
if (paramMap == null) {
-
synchronized (Descriptor.class) {
-
- paramMap = new HashMap();
+ paramMap = new HashMap<URL,List<Param>>();
}
}
- return Collections.unmodifiableList( (List) paramMap.get(url));
+ return Collections.unmodifiableList(paramMap.get(url));
}
/**
@@ -727,7 +718,7 @@
synchronized (Descriptor.class) {
- paramMap = new HashMap();
+ paramMap = new HashMap<URL,List<Param>>();
}
}
@@ -736,7 +727,7 @@
synchronized (Descriptor.class) {
- mimeMap = new HashMap();
+ mimeMap = new HashMap<URL,MimeType>();
}
}
@@ -754,7 +745,7 @@
}
// var to be put in maps
- List params = new ArrayList();
+ List<Param> params = new ArrayList<Param>();
String mimeMajor = null;
String mimeMinor = null;
@@ -809,16 +800,16 @@
String query = b.toString();
- List answers = context.getInterpreterBean().executeQueryToList(query);
+ List<Object> answers = context.getInterpreterBean().executeQueryToList(query);
Object obj = null;
try {
- for (Iterator ai = answers.iterator(); ai.hasNext(); ) {
+ for (Iterator<Object> ai = answers.iterator(); ai.hasNext(); ) {
obj = ai.next();
- Answer answer = ( (Answer) obj);
+ Answer answer = (Answer)obj;
// get our result
if (!answer.isUnconstrained()) {
Modified: trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorElement.java
===================================================================
--- trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorElement.java 2009-02-25 18:54:43 UTC (rev 1548)
+++ trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorElement.java 2009-02-25 18:57:22 UTC (rev 1549)
@@ -35,7 +35,6 @@
import javax.xml.parsers.*;
import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
// Log4j
import org.apache.log4j.*;
@@ -152,8 +151,7 @@
// create the descriptor URL
descURL = new URL(descURLString);
- }
- catch (MalformedURLException use) {
+ } catch (MalformedURLException use) {
log.debug("Unable to use URL from '" + descURLString +
"' as full URL attempting to make full URL");
@@ -211,8 +209,7 @@
}
bean = new ItqlInterpreterBean();
- }
- else {
+ } else {
if (log.isDebugEnabled()) {
@@ -226,7 +223,7 @@
des.setInterpreterBean(bean);
// get descriptor list of parameters to search for
- List paramsList = des.getParams(descURL);
+ List<Param> paramsList = des.getParams(descURL);
// get original params for this
// List origParams = des.getParams(descURL);
@@ -249,13 +246,11 @@
// populate params
String paramName = null;
Object paramValue = null;
- Param param = null;
- Vector paramVec = new Vector();
+ Vector<Param> paramVec = new Vector<Param>();
// iterate thru the parameters this desciptor has
- for (Iterator pi = paramsList.iterator(); pi.hasNext(); ) {
+ for (Param param: paramsList) {
- param = (Param) pi.next();
paramName = param.getName();
// we have to map some internal names to their proper values
@@ -266,8 +261,7 @@
log.debug("adding special param " + paramValue + " as " +
Descriptor.DESCRIPTOR_TARGET);
- }
- else {
+ } else {
paramValue =
extElem.getAttribute(paramName, context.getContextNode(),
@@ -301,14 +295,12 @@
factory.releaseDescriptor(des);
return doc;
- }
- catch (TransformerException te) {
+ } catch (TransformerException te) {
String errorString="Transformer problems (" + descURLString + ")";
log.error(errorString + " cause: " + te.getCause() );
throw new DescriptorException(errorString, te);
- }
- catch (Exception e) {
+ } catch (Exception e) {
String errorString="General Exception (" + descURLString + ")";
log.error(errorString + " cause: " + e.getCause());
@@ -353,8 +345,7 @@
}
bean = new ItqlInterpreterBean();
- }
- else {
+ } else {
if (log.isDebugEnabled()) {
@@ -373,7 +364,7 @@
// populate params
String paramName = null;
Object paramValue = null;
- Vector paramVec = new Vector();
+ Vector<Param> paramVec = new Vector<Param>();
// replace @@XXX@@
int start;
@@ -424,11 +415,9 @@
queryString =
StringUtil.replaceStringWithString(queryString,
DELIM + paramName + DELIM, paramValue.toString());
- }
- else {
+ } else {
- throw new DescriptorException("Could not find closing " + DELIM +
- " good bye");
+ throw new DescriptorException("Could not find closing " + DELIM + " good bye");
}
}
@@ -448,13 +437,11 @@
Element result = bean.execute(queryString);
return result;
- }
- catch (TransformerException te) {
+ } catch (TransformerException te) {
throw new DescriptorException("Transformer probs - query string: " +
queryString, te);
- }
- catch (java.lang.Exception e) {
+ } catch (java.lang.Exception e) {
throw new DescriptorException("Mulgara probs - query String:" +
queryString, e);
@@ -493,16 +480,13 @@
File destFile = new File(dest);
copy(srcFile, destFile);
- }
- catch (javax.xml.transform.TransformerException te) {
+ } catch (javax.xml.transform.TransformerException te) {
throw new DescriptorException("Unable to find attributes !", te);
- }
- catch (MalformedURLException mue) {
+ } catch (MalformedURLException mue) {
throw new DescriptorException("Bad File URL for source", mue);
- }
- catch (IOException ie) {
+ } catch (IOException ie) {
throw new DescriptorException("Unable to copy file:" + src + " to " +
dest, ie);
@@ -517,39 +501,22 @@
* @throws IOException EXCEPTION TO DO
*/
public static void copy(File src, File dst) throws IOException {
-
File parentDir = dst.getParentFile();
+ if (parentDir != null) parentDir.mkdirs();
- if (parentDir != null) {
-
- parentDir.mkdirs();
- }
-
InputStream is = new FileInputStream(src);
OutputStream os = null;
try {
-
os = new FileOutputStream(dst);
-
int n;
-
try {
-
byte[] buf = new byte[4096];
-
- while ( (n = is.read(buf)) != -1) {
-
- os.write(buf, 0, n);
- }
- }
- finally {
-
+ while ( (n = is.read(buf)) != -1) os.write(buf, 0, n);
+ } finally {
os.close();
}
- }
- finally {
-
+ } finally {
is.close();
}
}
@@ -570,9 +537,6 @@
String queryString = extElem.getFirstChild().getNodeValue();
queryString += extElem.getAttribute("msg");
- if (log.isDebugEnabled()) {
-
- log.debug("DEBUG:" + queryString);
- }
+ if (log.isDebugEnabled()) log.debug("DEBUG:" + queryString);
}
}
Modified: trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorException.java
===================================================================
--- trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorException.java 2009-02-25 18:54:43 UTC (rev 1548)
+++ trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorException.java 2009-02-25 18:57:22 UTC (rev 1549)
@@ -49,20 +49,23 @@
*/
public class DescriptorException extends Exception {
+ /** Serialization ID */
+ private static final long serialVersionUID = 8152923213619787421L;
+
/**
- * CONSTRUCTOR DescriptorException TO DO
+ * Creates an exception condition for managing descriptors
*
- * @param message PARAMETER TO DO
+ * @param message The message to report the problem
*/
public DescriptorException(String message) {
super(message);
}
/**
- * CONSTRUCTOR DescriptorException TO DO
+ * Creates a chained exception condition for managing descriptors
*
- * @param message PARAMETER TO DO
- * @param e PARAMETER TO DO
+ * @param message The message to report the problem
+ * @param e The causing exception to chain onto
*/
public DescriptorException(String message, Exception e) {
super(message, e);
Modified: trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorFactory.java
===================================================================
--- trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorFactory.java 2009-02-25 18:54:43 UTC (rev 1548)
+++ trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorFactory.java 2009-02-25 18:57:22 UTC (rev 1549)
@@ -69,12 +69,12 @@
/**
* Description of the Field
*/
- private static Map busyPool = new HashMap();
+ private static Map<URL,Set<Descriptor>> busyPool = new HashMap<URL,Set<Descriptor>>();
/**
- * Description of the Field
+ * Map of URLs to descriptors
*/
- private static Map freePool = new HashMap();
+ private static Map<URL,Set<SoftReference<Descriptor>>> freePool = new HashMap<URL,Set<SoftReference<Descriptor>>>();
/**
* Description of the Field
@@ -82,19 +82,18 @@
private ItqlInterpreterBean bean = null;
/**
- * CONSTRUCTOR DescriptorFactory TO DO
+ * Creates a descriptor factory
*/
public DescriptorFactory() {
this(null);
}
/**
- * CONSTRUCTOR DescriptorFactory TO DO
+ * Creates a descriptor factory
*
- * @param bean PARAMETER TO DO
+ * @param bean Access to the database
*/
public DescriptorFactory(ItqlInterpreterBean bean) {
-
this.bean = bean;
}
@@ -106,9 +105,7 @@
public static DescriptorFactory getInstance() {
if (descriptorFactory == null) {
-
synchronized (DescriptorFactory.class) {
-
descriptorFactory = new DescriptorFactory();
}
}
@@ -120,15 +117,13 @@
* Call with this getInstance first to set the bean to use when creating
* descriptors TODO very ugly must fix
*
- * @param bean PARAMETER TO DO
+ * @param bean Access to the database
* @return The Instance value
*/
public static DescriptorFactory getInstance(ItqlInterpreterBean bean) {
if (descriptorFactory == null) {
-
synchronized (DescriptorFactory.class) {
-
descriptorFactory = new DescriptorFactory(bean);
}
}
@@ -137,22 +132,21 @@
}
/**
- * Return the InterpreterBean used by the factory to pass to descriptors. bean
+ * Return the InterpreterBean used by the factory to pass to descriptors. bean
* will be null if factory was constructed without one.
*
- * @return bean see comment
+ * @return The access to the Mulgara database
*/
public ItqlInterpreterBean getItqlInterpreterBean() {
-
return bean;
}
/**
* Gets the Descriptor attribute of the DescriptorFactory object
*
- * @param url PARAMETER TO DO
+ * @param url The key to find the descriptor by
* @return The Descriptor value
- * @throws DescriptorException EXCEPTION TO DO
+ * @throws DescriptorException The descriptor could not be marked as available
*/
public Descriptor getDescriptor(URL url) throws DescriptorException {
@@ -162,12 +156,9 @@
descriptor = getFromFreePool(url);
if (descriptor == null) {
-
log.info("creating descriptor! " + url);
descriptor = new Descriptor(url, bean);
- }
- else if (log.isDebugEnabled()) {
-
+ } else if (log.isDebugEnabled()) {
log.debug("reusing descriptor! " + url);
}
@@ -180,12 +171,10 @@
/**
* Releases a descriptor
*
- * @param descriptor PARAMETER TO DO
- * @throws DescriptorException EXCEPTION TO DO
+ * @param descriptor Descriptor to be released
+ * @throws DescriptorException If the descriptor was not allocated
*/
- public void releaseDescriptor(Descriptor descriptor) throws
- DescriptorException {
-
+ public void releaseDescriptor(Descriptor descriptor) throws DescriptorException {
putInFreePool(getFromBusyPool(descriptor));
}
@@ -193,7 +182,7 @@
* Clears the cache of descriptors. this is normally done if a descriptor has
* been changed externally and the cached versions are now invalid
*
- * @throws DescriptorException EXCEPTION TO DO
+ * @throws DescriptorException Unable to manage the descriptor
*/
public void clearDescriptorCache() throws DescriptorException {
@@ -203,20 +192,15 @@
//resetDescriptorSet(busyPool.keySet(), busyPool);
//busyPool.clear();
- Set urls = busyPool.keySet();
- Set set = null;
- URL url = null;
+ Set<URL> urls = busyPool.keySet();
+ Set<Descriptor> set = null;
- for (Iterator i = urls.iterator(); i.hasNext(); ) {
+ for (URL url: urls) {
- // get next URL
- url = (URL) i.next();
-
// get the set of these descriptors
- set = (Set) busyPool.get(url);
+ set = busyPool.get(url);
if (set.size() != 0) {
-
log.warn("Clearing descriptor Cache but there are still " +
" active descriptors in busy pool for " + url + " these " +
" have been ignored");
@@ -225,38 +209,34 @@
}
synchronized (freePool) {
-
resetDescriptorSet(freePool.keySet(), freePool);
freePool.clear();
}
}
/**
- * Gets a descriptor from the busy pool, the same descriptor is returned - its
+ * Gets a descriptor from the busy pool, the same descriptor is returned - its
* not in ANY pool when returned
*
- * @param descriptor PARAMETER TO DO
+ * @param descriptor Descriptor to get from the busy pool
* @return The FromBusyPool value
- * @throws DescriptorException EXCEPTION TO DO
+ * @throws DescriptorException if the descriptor was not available
*/
- private Descriptor getFromBusyPool(Descriptor descriptor) throws
- DescriptorException {
+ private Descriptor getFromBusyPool(Descriptor descriptor) throws DescriptorException {
URL url = descriptor.getURL();
synchronized (busyPool) {
- Set busyDes = (Set) busyPool.get(url);
+ Set<Descriptor> busyDes = busyPool.get(url);
- if ( (busyDes == null) || (busyDes.size() == 0)) {
-
+ if ((busyDes == null) || (busyDes.size() == 0)) {
throw new DescriptorException(
"tried to remove descriptor from empty busy pool " +
" and its not there! URL: " + url + " Pool Set: " + busyDes);
}
if (!busyDes.remove(descriptor)) {
-
throw new DescriptorException(
"tried to remove descriptor from busy pool " +
" and its not there! URL: " + url);
@@ -269,86 +249,60 @@
/**
* gets a descriptor from the free pool or null if there isn't one
*
- * @param url PARAMETER TO DO
+ * @param url The key to find the descriptor with
* @return The FromFreePool value
*/
private Descriptor getFromFreePool(URL url) {
Descriptor descriptor = null;
- SoftReference ref = null;
synchronized (freePool) {
- Set freeDes = (Set) freePool.get(url);
+ Set<SoftReference<Descriptor>> freeDes = freePool.get(url);
- if ( (freeDes != null) && (freeDes.size() > 0)) {
+ if ((freeDes != null) && (freeDes.size() > 0)) {
// get first available non null descriptor
// debug
if (log.isDebugEnabled()) {
-
log.debug("Looking in free pool for : " + url);
}
// iterate thru set of soft ref'ed descriptors..
- for (Iterator i = freeDes.iterator(); i.hasNext(); ) {
+ for (SoftReference<Descriptor> ref: freeDes) {
- //descriptor = (Descriptor)(((SoftReference)i.next()).get());
- ref = (SoftReference) i.next();
- descriptor = (Descriptor) ref.get();
+ descriptor = ref.get();
// got a non garbage collected descriptor
if (descriptor != null) {
+ if (log.isDebugEnabled()) log.debug("Got Free descriptor : " + url);
- // debug
- if (log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) log.debug("free pool size b4 removal : " + freeDes.size());
- log.debug("Got Free descriptor : " + url);
- }
-
- // debug
- if (log.isDebugEnabled()) {
-
- log.debug("free pool size b4 removal : " + freeDes.size());
- }
-
// remove it from the free list
freeDes.remove(ref);
- // debug
- if (log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) log.debug("free pool size after removal : " + freeDes.size());
- log.debug("free pool size after removal : " + freeDes.size());
- }
-
// return it
return descriptor;
- }
- else if (log.isDebugEnabled()) {
-
+ } else if (log.isDebugEnabled()) {
log.debug("free pool descriptor gc'ed: " + url);
}
}
// debug
if (log.isDebugEnabled()) {
-
- log.debug("Free pool soft referenced descriptors gc'ed for : " +
- url);
+ log.debug("Free pool soft referenced descriptors gc'ed for : " + url);
}
- // if we got here then all soft referenced descriptors have been garbage
- // collected
+ // if we got here then all soft referenced descriptors have been garbage collected
return null;
- }
- else {
+ } else {
// debug
- if (log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) log.debug("Nothing in free pool for : " + url);
- log.debug("Nothing in free pool for : " + url);
- }
-
// nothing in pool
return null;
}
@@ -358,7 +312,7 @@
/**
* puts a descriptor in a pool
*
- * @param descriptor PARAMETER TO DO
+ * @param descriptor The descriptor to mark as free
*/
private void putInFreePool(Descriptor descriptor) {
@@ -368,21 +322,19 @@
synchronized (freePool) {
// get the set for this URL
- Set set = (Set) freePool.get(url);
+ Set<SoftReference<Descriptor>> set = freePool.get(url);
// create set if needed
if (set == null) {
-
- set = new HashSet();
+ set = new HashSet<SoftReference<Descriptor>>();
freePool.put(url, set);
}
// add this descriptor to the set
- set.add(new SoftReference(descriptor));
+ set.add(new SoftReference<Descriptor>(descriptor));
// debug
if (log.isDebugEnabled()) {
-
log.debug("Free Pool size: " + set.size() + " for url: " + url);
}
}
@@ -391,7 +343,7 @@
/**
* puts a descriptor in a persistent pool
*
- * @param descriptor PARAMETER TO DO
+ * @param descriptor The descriptor to mark as busy
*/
private void putInBusyPool(Descriptor descriptor) {
@@ -401,21 +353,17 @@
synchronized (busyPool) {
// get the set for this URL
- Set set = (Set) busyPool.get(url);
+ Set<Descriptor> set = busyPool.get(url);
// create set if needed
if (set == null) {
-
- set = new HashSet();
+ set = new HashSet<Descriptor>();
busyPool.put(url, set);
}
// debug
- if (log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) log.debug("Busy Pool size: " + set.size());
- log.debug("Busy Pool size: " + set.size());
- }
-
// add this descriptor to the set
set.add(descriptor);
}
@@ -424,54 +372,23 @@
/**
* resets descriptors in a set
*
- * @param descriptors PARAMETER TO DO
- * @param pool PARAMETER TO DO
- * @throws DescriptorException EXCEPTION TO DO
+ * @param descriptors The set of keys for descriptors to reset
+ * @param pool The pool that references to descriptors can be found in
+ * @throws DescriptorException Unable to manage the descriptor
*/
- private void resetDescriptorSet(Set descriptors, Map pool) throws
- DescriptorException {
-
- // reset every descriptor
- URL url = null;
- Descriptor des = null;
- Set set = null;
-
+ private void resetDescriptorSet(Set<URL> descriptors, Map<URL,Set<SoftReference<Descriptor>>> pool) throws DescriptorException {
synchronized (pool) {
-
- for (Iterator i = descriptors.iterator(); i.hasNext(); ) {
-
- url = (URL) i.next();
-
+ for (URL url: descriptors) {
// get the set of these descriptors
- set = (Set) pool.get(url);
-
+ Set<SoftReference<Descriptor>> set = pool.get(url);
// go thru each and reset
- for (Iterator pi = set.iterator(); pi.hasNext(); ) {
-
- Object obj = pi.next();
-
- if (obj instanceof SoftReference) {
-
- des = (Descriptor) ( (SoftReference) obj).get();
- }
- else if (obj instanceof Descriptor) {
-
- des = (Descriptor) obj;
- }
- else {
-
- throw new DescriptorException("Found wacky object " + obj +
- " in Set, should be SoftReference or Descriptor");
- }
-
+ for (Iterator<SoftReference<Descriptor>> pi = set.iterator(); pi.hasNext(); ) {
+ Descriptor des = pi.next().get();
if (des != null) {
-
des.resetSettings();
- }
- else {
-
+ } else {
// remove this from the set, its not used any more
- set.remove(obj);
+ pi.remove();
}
}
}
Modified: trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorServlet.java
===================================================================
--- trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorServlet.java 2009-02-25 18:54:43 UTC (rev 1548)
+++ trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorServlet.java 2009-02-25 18:57:22 UTC (rev 1549)
@@ -40,13 +40,6 @@
// Third party packages
import org.apache.log4j.*;
-// Debugging writer
-import org.apache.soap.util.xml.DOM2Writer;
-import org.mulgara.server.EmbeddedMulgaraServer;
-
-// DOM
-import org.w3c.dom.*;
-
/**
*
* @axis.service name="DescriptorService"
@@ -70,6 +63,9 @@
*/
public class DescriptorServlet extends HttpServlet {
+ /** Serialization ID */
+ private static final long serialVersionUID = -8766212391201433314L;
+
/**
* descriptor username for Mulgara access
*/
@@ -97,11 +93,6 @@
private final static String MIME_TYPE = "_mimeType";
/**
- * hostname of this machine
- */
- private static String hostname = null;
-
- /**
* unknown mimeType
*/
private final static String UNKNOWN_MIME_TYPE = "unknown/unknown";
@@ -330,6 +321,7 @@
* @throws ServletException EXCEPTION TO DO
* @throws IOException EXCEPTION TO DO
*/
+ @SuppressWarnings("unchecked")
public void doGet(HttpServletRequest req, HttpServletResponse res) throws
ServletException, IOException {
@@ -343,9 +335,8 @@
URL descURL = null;
String mimeType = null;
- PrintWriter out = res.getWriter();
-
// if this gets set to thru reset the factory descriptors
+ @SuppressWarnings("unused")
boolean clearDescriptorCache = false;
// get descriptor URL first.
@@ -353,42 +344,30 @@
// sanity check url
if (url == null) {
-
throw new ServletException("Insifficient parameters supplied - no URL " +
Descriptor.DESCRIPTOR_SELF + " parameter");
}
try {
-
// see if we have a source URL string
sourceURLString = req.getParameter(Descriptor.DESCRIPTOR_SOURCE);
// try and make a URL first
try {
-
if (log.isDebugEnabled()) {
-
log.debug("Attempting to construct descriptor URL from " + url);
}
-
descURL = new URL(url);
- }
- catch (MalformedURLException mue) {
-
+ } catch (MalformedURLException mue) {
// if we have a source attribute attempt to make a full URL
if (sourceURLString != null) {
-
if (log.isDebugEnabled()) {
-
log.debug(
"Attempting to absolute construct descriptor URL from relative URL '" +
url + "' and source URL '" + sourceURLString + "'");
}
-
descURL = Descriptor.resolveRelativeURL(url, sourceURLString);
- }
- else {
-
+ } else {
throw new DescriptorException("Partial URL: '" + url +
"' can not be used to find " +
" descriptor, use full URL or supply full URL of descriptor located relative " +
@@ -399,13 +378,11 @@
// Get a Descriptor Factory instance
if (factory == null) {
-
factory = DescriptorFactory.getInstance();
}
// check if we need to clear the cache
if (req.getParameter(Descriptor.CLEAR_DESCRIPTOR_CACHE) != null) {
-
factory.clearDescriptorCache();
}
@@ -413,12 +390,12 @@
Descriptor des = factory.getDescriptor(descURL);
// get the params for the descriptor,
- List params = new Vector();
+ List<Param> params = new Vector<Param>();
// fill paramsList with modifiable copy of descriptor list
// Collections.copy(paramsList, des.getParams(descURL));
// Extract the remaining parameters
- Enumeration enumeration = req.getParameterNames();
+ Enumeration<String> enumeration = (Enumeration<String>)req.getParameterNames();
// check if we have any params, if not show usage screen
if (enumeration.hasMoreElements()) {
@@ -426,47 +403,36 @@
//Output the parameters to the debug logger
while (enumeration.hasMoreElements()) {
- String name = (String) enumeration.nextElement();
+ String name = enumeration.nextElement();
String[] values = req.getParameterValues(name);
// if param is required then value can NOT be null or empty string
// otherwise remove name value pair
if (values != null) {
- for (int i = 0; i < values.length; i++) {
+ int i = 0;
+ for (String value: values) {
if (log.isDebugEnabled()) {
-
- log.debug("HTTP param name :" + name + " (" + i + ") : '" +
- values[i] + "'");
+ log.debug("HTTP param name :" + name + " (" + i++ + ") : '" + value + "'");
}
//Check for the descriptor url
if (name.equalsIgnoreCase(Descriptor.CLEAR_DESCRIPTOR_CACHE)) {
-
clearDescriptorCache = true;
- }
- else if (name.equalsIgnoreCase(MIME_TYPE)) {
-
- mimeType = values[i];
- }
- else if (name.equalsIgnoreCase(Descriptor.DESCRIPTOR_SELF)) {
-
+ } else if (name.equalsIgnoreCase(MIME_TYPE)) {
+ mimeType = value;
+ } else if (name.equalsIgnoreCase(Descriptor.DESCRIPTOR_SELF)) {
// IGNORE we have it already.
- }
- else if (name.equalsIgnoreCase(Descriptor.DESCRIPTOR_SOURCE)) {
-
+ } else if (name.equalsIgnoreCase(Descriptor.DESCRIPTOR_SOURCE)) {
// IGNORE we already have it.
- }
- else if ( (values[i] != null) && (values[i].length() > 0)) {
+ } else if ( (value != null) && (value.length() > 0)) {
+ params.add(new Param(name, value));
+ } else if (log.isDebugEnabled()) {
- params.add(new Param(name, values[i]));
- }
- else if (log.isDebugEnabled()) {
-
// ignoring empty value
log.debug("ignoring parameter " + name + " value is " +
- ( (values[i] == null) ? "null" : "zero length"));
+ ( (value == null) ? "null" : "zero length"));
}
}
}
@@ -480,14 +446,12 @@
// set mime type if known and not over ridden
if (mimeType == null) {
-
// not set as HTTP param - use configured mimetype
mimeType = des.getMimeType().toString();
}
// set it unless unknown type
if (!mimeType.equals(UNKNOWN_MIME_TYPE)) {
-
res.setContentType(mimeType);
}
@@ -499,8 +463,7 @@
// return the descriptor
factory.releaseDescriptor(des);
- }
- else {
+ } else {
// No parameters
log.debug("NO parameters");
@@ -508,13 +471,9 @@
// redirect to the index.jsp page with some needed params
res.sendRedirect("index.jsp");
}
- }
- catch (MalformedURLException mue) {
-
+ } catch (MalformedURLException mue) {
throw new ServletException("Bad URL for Descriptor", mue);
- }
- catch (DescriptorException de) {
-
+ } catch (DescriptorException de) {
throw new ServletException("Descriptor Problem", de);
}
}
@@ -523,7 +482,7 @@
* Initatiates the servlet
*
* @param config Servlet Config
- * @throws ServletException EXCEPTION TO DO
+ * @throws ServletException Error initializing the servlet framework
*/
public void init(ServletConfig config) throws ServletException {
Modified: trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorUtil.java
===================================================================
--- trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorUtil.java 2009-02-25 18:54:43 UTC (rev 1548)
+++ trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorUtil.java 2009-02-25 18:57:22 UTC (rev 1549)
@@ -29,7 +29,6 @@
// Java 2 standard packages
-import java.io.*;
import java.net.*;
import java.util.*;
@@ -39,8 +38,6 @@
// Debugging writer
import org.apache.axis.utils.DOM2Writer;
-import org.mulgara.server.EmbeddedMulgaraServer;
-
// DOM
import org.w3c.dom.*;
@@ -109,7 +106,7 @@
* @return see description.
* @throws Exception thrown when the descriptor has an internal exception.
*/
- public String invokeToString(HashMap params) throws Exception {
+ public String invokeToString(HashMap<String,String> params) throws Exception {
// if this gets set to thru reset the factory descriptors
boolean clearDescriptorCache = false;
@@ -126,57 +123,39 @@
String url = null;
int i = 0;
- for (Iterator pi = params.keySet().iterator(); pi.hasNext(); ) {
+ for (String key: params.keySet()) {
- String key = (String) pi.next();
String value = (String) params.get(key);
parameters[i++] = new Param(key, value);
//Check for the descriptor url
if (key.equalsIgnoreCase(Descriptor.CLEAR_DESCRIPTOR_CACHE)) {
-
clearDescriptorCache = true;
- }
- else if (key.equalsIgnoreCase(Descriptor.DESCRIPTOR_SELF)) {
-
+ } else if (key.equalsIgnoreCase(Descriptor.DESCRIPTOR_SELF)) {
url = value;
- }
- else if (key.equalsIgnoreCase(Descriptor.DESCRIPTOR_SOURCE)) {
-
+ } else if (key.equalsIgnoreCase(Descriptor.DESCRIPTOR_SOURCE)) {
// we've got a _source param - above url must be relative
sourceURLString = value;
}
}
if (url == null) {
-
- throw new Exception(Descriptor.DESCRIPTOR_SELF +
- " not set as a name value pair");
+ throw new Exception(Descriptor.DESCRIPTOR_SELF + " not set as a name value pair");
}
// Create Descriptor Factory
- if (factory == null) {
+ if (factory == null) factory = DescriptorFactory.getInstance();
- factory = DescriptorFactory.getInstance();
- }
-
try {
// received a clear descriptor cache command
- if (clearDescriptorCache) {
+ if (clearDescriptorCache) factory.clearDescriptorCache();
- factory.clearDescriptorCache();
- }
-
try {
-
descURL = new URL(url);
-
// we have a source attribute
- }
- catch (MalformedURLException mue) {
-
+ } catch (MalformedURLException mue) {
descURL = Descriptor.resolveRelativeURL(url, sourceURLString);
}
@@ -188,9 +167,7 @@
// return the descriptor
factory.releaseDescriptor(des);
- }
- catch (DescriptorException de) {
-
+ } catch (DescriptorException de) {
throw new Exception("Descriptor Problem", de);
}
@@ -212,7 +189,6 @@
public Element invokeDescriptor(Element eparams) throws Exception {
if (log.isDebugEnabled()) {
-
log.debug("SOAP SUBMITTED PARAMS:" + DOM2Writer.nodeToString((Node)eparams, true));
}
@@ -247,7 +223,6 @@
String value = (String) param.getFirstChild().getNodeValue();
if (log.isDebugEnabled()) {
-
log.debug("Descriptor PARAM: name " + name + " value " + value);
}
@@ -255,48 +230,32 @@
//Check for the descriptor url
if (name.equalsIgnoreCase(Descriptor.CLEAR_DESCRIPTOR_CACHE)) {
-
clearDescriptorCache = true;
- }
- else if (name.equalsIgnoreCase(Descriptor.DESCRIPTOR_SELF)) {
-
+ } else if (name.equalsIgnoreCase(Descriptor.DESCRIPTOR_SELF)) {
url = value;
- }
- else if (name.equalsIgnoreCase(Descriptor.DESCRIPTOR_SOURCE)) {
-
+ } else if (name.equalsIgnoreCase(Descriptor.DESCRIPTOR_SOURCE)) {
// we've got a _source param - above url must be relative
sourceURLString = value;
}
}
if (url == null) {
-
- throw new Exception(Descriptor.DESCRIPTOR_SELF +
- " not set as a name value pair");
+ throw new Exception(Descriptor.DESCRIPTOR_SELF + " not set as a name value pair");
}
// Create Descriptor Factory
- if (factory == null) {
+ if (factory == null) factory = DescriptorFactory.getInstance();
- factory = DescriptorFactory.getInstance();
- }
-
try {
-
// received a clear descriptor cache command
if (clearDescriptorCache) {
-
factory.clearDescriptorCache();
}
try {
-
descURL = new URL(url);
-
// we have a source attribute
- }
- catch (MalformedURLException mue) {
-
+ } catch (MalformedURLException mue) {
descURL = Descriptor.resolveRelativeURL(url, sourceURLString);
}
@@ -308,11 +267,8 @@
// return the descriptor
factory.releaseDescriptor(des);
- }
- catch (DescriptorException de) {
-
+ } catch (DescriptorException de) {
de.printStackTrace();
-
throw new Exception("Descriptor Problem: " + de.getCause(), de);
}
Modified: trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorUtility.java
===================================================================
--- trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorUtility.java 2009-02-25 18:54:43 UTC (rev 1548)
+++ trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorUtility.java 2009-02-25 18:57:22 UTC (rev 1549)
@@ -29,7 +29,6 @@
// Java 2 standard packages
-import java.io.*;
import java.net.*;
import java.util.*;
@@ -39,8 +38,6 @@
// Debugging writer
import org.apache.axis.utils.DOM2Writer;
-import org.mulgara.server.EmbeddedMulgaraServer;
-
// DOM
import org.w3c.dom.*;
@@ -109,7 +106,7 @@
* @return see description.
* @throws Exception thrown when the descriptor has an internal exception.
*/
- public String invokeToString(HashMap params) throws Exception {
+ public String invokeToString(HashMap<String,String> params) throws Exception {
// if this gets set to thru reset the factory descriptors
boolean clearDescriptorCache = false;
@@ -126,10 +123,9 @@
String url = null;
int i = 0;
- for (Iterator pi = params.keySet().iterator(); pi.hasNext(); ) {
+ for (String key: params.keySet()) {
- String key = (String) pi.next();
- String value = (String) params.get(key);
+ String value = params.get(key);
parameters[i++] = new Param(key, value);
@@ -137,12 +133,10 @@
if (key.equalsIgnoreCase(Descriptor.CLEAR_DESCRIPTOR_CACHE)) {
clearDescriptorCache = true;
- }
- else if (key.equalsIgnoreCase(Descriptor.DESCRIPTOR_SELF)) {
+ } else if (key.equalsIgnoreCase(Descriptor.DESCRIPTOR_SELF)) {
url = value;
- }
- else if (key.equalsIgnoreCase(Descriptor.DESCRIPTOR_SOURCE)) {
+ } else if (key.equalsIgnoreCase(Descriptor.DESCRIPTOR_SOURCE)) {
// we've got a _source param - above url must be relative
sourceURLString = value;
@@ -150,33 +144,23 @@
}
if (url == null) {
-
- throw new Exception(Descriptor.DESCRIPTOR_SELF +
- " not set as a name value pair");
+ throw new Exception(Descriptor.DESCRIPTOR_SELF + " not set as a name value pair");
}
// Create Descriptor Factory
if (factory == null) {
-
factory = DescriptorFactory.getInstance();
}
try {
// received a clear descriptor cache command
- if (clearDescriptorCache) {
+ if (clearDescriptorCache) factory.clearDescriptorCache();
- factory.clearDescriptorCache();
- }
-
try {
-
descURL = new URL(url);
-
// we have a source attribute
- }
- catch (MalformedURLException mue) {
-
+ } catch (MalformedURLException mue) {
descURL = Descriptor.resolveRelativeURL(url, sourceURLString);
}
@@ -188,9 +172,7 @@
// return the descriptor
factory.releaseDescriptor(des);
- }
- catch (DescriptorException de) {
-
+ } catch (DescriptorException de) {
throw new Exception("Descriptor Problem", de);
}
@@ -212,7 +194,6 @@
public Element invokeDescriptor(Element eparams) throws Exception {
if (log.isDebugEnabled()) {
-
log.debug("SOAP SUBMITTED PARAMS:" + DOM2Writer.nodeToString((Node)eparams, true));
}
@@ -240,14 +221,13 @@
// loop thru children
for (int i = 0; i < cl.getLength(); i++) {
- Element param = (Element) cl.item(i);
+ Element param = (Element)cl.item(i);
// name value pairs
String name = param.getTagName();
String value = (String) param.getFirstChild().getNodeValue();
if (log.isDebugEnabled()) {
-
log.debug("Descriptor PARAM: name " + name + " value " + value);
}
@@ -257,27 +237,20 @@
if (name.equalsIgnoreCase(Descriptor.CLEAR_DESCRIPTOR_CACHE)) {
clearDescriptorCache = true;
- }
- else if (name.equalsIgnoreCase(Descriptor.DESCRIPTOR_SELF)) {
-
+ } else if (name.equalsIgnoreCase(Descriptor.DESCRIPTOR_SELF)) {
url = value;
- }
- else if (name.equalsIgnoreCase(Descriptor.DESCRIPTOR_SOURCE)) {
-
+ } else if (name.equalsIgnoreCase(Descriptor.DESCRIPTOR_SOURCE)) {
// we've got a _source param - above url must be relative
sourceURLString = value;
}
}
if (url == null) {
-
- throw new Exception(Descriptor.DESCRIPTOR_SELF +
- " not set as a name value pair");
+ throw new Exception(Descriptor.DESCRIPTOR_SELF + " not set as a name value pair");
}
// Create Descriptor Factory
if (factory == null) {
-
factory = DescriptorFactory.getInstance();
}
@@ -285,17 +258,13 @@
// received a clear descriptor cache command
if (clearDescriptorCache) {
-
factory.clearDescriptorCache();
}
try {
-
descURL = new URL(url);
-
// we have a source attribute
- }
- catch (MalformedURLException mue) {
+ } catch (MalformedURLException mue) {
descURL = Descriptor.resolveRelativeURL(url, sourceURLString);
}
@@ -308,11 +277,8 @@
// return the descriptor
factory.releaseDescriptor(des);
- }
- catch (DescriptorException de) {
-
+ } catch (DescriptorException de) {
de.printStackTrace();
-
throw new Exception("Descriptor Problem: " + de.getCause(), de);
}
Modified: trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/PIErrorHandler.java
===================================================================
--- trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/PIErrorHandler.java 2009-02-25 18:54:43 UTC (rev 1548)
+++ trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/PIErrorHandler.java 2009-02-25 18:57:22 UTC (rev 1549)
@@ -68,6 +68,7 @@
/**
* Description of the Field
*/
+ @SuppressWarnings("unused")
private static final Logger log = Logger.getLogger("XALAN");
/**
@@ -420,7 +421,7 @@
* @return The wrapped exception, or <code>null</code> if there is no getException method on e.
*/
private static Exception getWrappedException(Object e) {
- Class c = e.getClass();
+ Class<?> c = e.getClass();
try {
Method m = c.getMethod("getException");
return (Exception)m.invoke(e);
Modified: trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/test/DescriptorUtilServiceTest.java
===================================================================
--- trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/test/DescriptorUtilServiceTest.java 2009-02-25 18:54:43 UTC (rev 1548)
+++ trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/test/DescriptorUtilServiceTest.java 2009-02-25 18:57:22 UTC (rev 1549)
@@ -65,8 +65,8 @@
*/
public void test1DescriptorServiceInvokeToString() throws Exception {
- org.mulgara.descriptor.DescriptorServiceSoapBindingStub binding = null;
/*
+ org.mulgara.descriptor.DescriptorServiceSoapBindingStub binding = null;
try {
binding = (org.mulgara.descriptor.DescriptorServiceSoapBindingStub)
new org.mulgara.descriptor.DescriptorUtilServiceLocator().getDescriptorService();
@@ -76,7 +76,6 @@
jre.getLinkedCause().printStackTrace();
throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException caught: " + jre);
}
- */
assertNotNull("binding is null", binding);
// Time out after a minute
@@ -93,12 +92,14 @@
// finally, test for helloworld
assertEquals(testValue, value);
+ */
}
- private HashMap createHashMap() throws Exception {
+ @SuppressWarnings("unused")
+ private HashMap<String,String> createHashMap() throws Exception {
- HashMap descriptorHash = new HashMap();
+ HashMap<String,String> descriptorHash = new HashMap<String,String>();
descriptorHash.put(Descriptor.DESCRIPTOR_SELF,
"http://" + hostName +
":8080/webservices/descriptor/descriptors/test/hello.xsl");
@@ -109,13 +110,11 @@
return descriptorHash;
}
+ @SuppressWarnings("unused")
private Element createElement() throws Exception {
- // Set up parameters
- Vector params = new Vector();
-
// assemble descriptor parameters into hashtable
- HashMap descriptorHash = new HashMap();
+ HashMap<String,String> descriptorHash = new HashMap<String,String>();
descriptorHash.put(Descriptor.DESCRIPTOR_SELF,
"http://" + hostName +
":8080/webservices/descriptor/descriptors/test/hello.xsl");
@@ -136,10 +135,9 @@
// <name> is the real name of the parameter
Element element = doc.createElement("descriptor-params");
- for (Iterator e = descriptorHash.keySet().iterator(); e.hasNext(); ) {
+ for (String key: descriptorHash.keySet()) {
- String key = (String) e.next();
- String value = (String) descriptorHash.get(key);
+ String value = descriptorHash.get(key);
Element dParam = doc.createElement(key);
dParam.appendChild(doc.createTextNode(value));
@@ -147,8 +145,7 @@
element.appendChild(dParam);
}
- System.out.println("SOAP CLIENT PARAMS:" +
- DOM2Writer.nodeToString((Node)element, true));
+ System.out.println("SOAP CLIENT PARAMS:" + DOM2Writer.nodeToString((Node)element, true));
return element;
}
More information about the Mulgara-svn
mailing list