[savara-commits] savara SVN: r118 - in tools/eclipse/trunk/plugins/org.pi4soa.monitor: META-INF and 3 other directories.

Author: objectiser Date: 2009-12-07 18:23:54 -0500 (Mon, 07 Dec 2009) New Revision: 118 Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/ tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/concurrent.jar tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/javassist.jar tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-aop-client.jar tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-client.jar tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-common-core.jar tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-javaee.jar tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-logging-spi.jar tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-mdr.jar tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-messaging-client.jar tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-remoting.jar tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jnp-client.jar tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/log4j.jar tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/trove.jar Modified: tools/eclipse/trunk/plugins/org.pi4soa.monitor/.classpath tools/eclipse/trunk/plugins/org.pi4soa.monitor/META-INF/MANIFEST.MF tools/eclipse/trunk/plugins/org.pi4soa.monitor/build.properties tools/eclipse/trunk/plugins/org.pi4soa.monitor/src/java/org/pi4soa/monitor/eclipse/MonitorLauncher.java tools/eclipse/trunk/plugins/org.pi4soa.monitor/src/java/org/pi4soa/monitor/ui/Monitor.java Log: SAVARA-48 - include pi4soa swing based monitor as part of Savara temporarily until a SAM and JOPR based solution is available. Modified: tools/eclipse/trunk/plugins/org.pi4soa.monitor/.classpath =================================================================== --- tools/eclipse/trunk/plugins/org.pi4soa.monitor/.classpath 2009-12-07 17:57:30 UTC (rev 117) +++ tools/eclipse/trunk/plugins/org.pi4soa.monitor/.classpath 2009-12-07 23:23:54 UTC (rev 118) @@ -1,7 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/java"/> + <classpathentry exported="true" kind="lib" path="lib/log4j.jar"/> + <classpathentry exported="true" kind="lib" path="lib/trove.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="lib" path="lib/jboss-client.jar"/> + <classpathentry kind="lib" path="lib/jboss-javaee.jar"/> + <classpathentry kind="lib" path="lib/jnp-client.jar"/> + <classpathentry kind="lib" path="lib/jboss-logging-spi.jar"/> + <classpathentry kind="lib" path="lib/jboss-messaging-client.jar"/> + <classpathentry kind="lib" path="lib/jboss-aop-client.jar"/> + <classpathentry kind="lib" path="lib/jboss-mdr.jar"/> <classpathentry kind="output" path="classes"/> </classpath> Modified: tools/eclipse/trunk/plugins/org.pi4soa.monitor/META-INF/MANIFEST.MF =================================================================== --- tools/eclipse/trunk/plugins/org.pi4soa.monitor/META-INF/MANIFEST.MF 2009-12-07 17:57:30 UTC (rev 117) +++ tools/eclipse/trunk/plugins/org.pi4soa.monitor/META-INF/MANIFEST.MF 2009-12-07 23:23:54 UTC (rev 118) @@ -23,4 +23,17 @@ org.eclipse.emf.ecore, org.pi4soa.common Eclipse-LazyStart: true -Bundle-ClassPath: . +Bundle-ClassPath: ., + lib/concurrent.jar, + lib/javassist.jar, + lib/jboss-aop-client.jar, + lib/jboss-client.jar, + lib/jboss-common-core.jar, + lib/jboss-javaee.jar, + lib/jboss-logging-spi.jar, + lib/jboss-mdr.jar, + lib/jboss-messaging-client.jar, + lib/jboss-remoting.jar, + lib/jnp-client.jar, + lib/log4j.jar, + lib/trove.jar Modified: tools/eclipse/trunk/plugins/org.pi4soa.monitor/build.properties =================================================================== --- tools/eclipse/trunk/plugins/org.pi4soa.monitor/build.properties 2009-12-07 17:57:30 UTC (rev 117) +++ tools/eclipse/trunk/plugins/org.pi4soa.monitor/build.properties 2009-12-07 23:23:54 UTC (rev 118) @@ -3,11 +3,26 @@ bin.includes = META-INF/,\ .,\ plugin.xml,\ - LICENSE.txt + LICENSE.txt,\ + lib/,\ + lib/concurrent.jar,\ + lib/javassist.jar,\ + lib/jboss-aop-client.jar,\ + lib/jboss-client.jar,\ + lib/jboss-common-core.jar,\ + lib/jboss-javaee.jar,\ + lib/jboss-logging-spi.jar,\ + lib/jboss-mdr.jar,\ + lib/jboss-messaging-client.jar,\ + lib/jboss-remoting.jar,\ + lib/jnp-client.jar,\ + lib/log4j.jar,\ + lib/trove.jar src.includes = .classpath,\ .project,\ LICENSE.txt,\ META-INF/,\ build.properties,\ plugin.xml,\ - src/ + src/,\ + lib/ Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/concurrent.jar =================================================================== (Binary files differ) Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/concurrent.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/javassist.jar =================================================================== (Binary files differ) Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/javassist.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-aop-client.jar =================================================================== (Binary files differ) Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-aop-client.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-client.jar =================================================================== (Binary files differ) Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-client.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-common-core.jar =================================================================== (Binary files differ) Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-common-core.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-javaee.jar =================================================================== (Binary files differ) Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-javaee.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-logging-spi.jar =================================================================== (Binary files differ) Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-logging-spi.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-mdr.jar =================================================================== (Binary files differ) Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-mdr.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-messaging-client.jar =================================================================== (Binary files differ) Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-messaging-client.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-remoting.jar =================================================================== (Binary files differ) Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-remoting.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jnp-client.jar =================================================================== (Binary files differ) Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jnp-client.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/log4j.jar =================================================================== (Binary files differ) Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/log4j.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/trove.jar =================================================================== (Binary files differ) Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/trove.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tools/eclipse/trunk/plugins/org.pi4soa.monitor/src/java/org/pi4soa/monitor/eclipse/MonitorLauncher.java =================================================================== --- tools/eclipse/trunk/plugins/org.pi4soa.monitor/src/java/org/pi4soa/monitor/eclipse/MonitorLauncher.java 2009-12-07 17:57:30 UTC (rev 117) +++ tools/eclipse/trunk/plugins/org.pi4soa.monitor/src/java/org/pi4soa/monitor/eclipse/MonitorLauncher.java 2009-12-07 23:23:54 UTC (rev 118) @@ -23,12 +23,14 @@ import java.text.MessageFormat; import java.util.Map; import java.util.Vector; +import java.util.logging.Level; import java.util.logging.Logger; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Platform; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunchConfiguration; @@ -44,6 +46,9 @@ import org.eclipse.jdt.launching.IVMInstall; import org.eclipse.jdt.launching.IVMRunner; import org.eclipse.jdt.launching.VMRunnerConfiguration; +import org.eclipse.osgi.util.ManifestElement; +import org.osgi.framework.Bundle; +import org.osgi.framework.Constants; import org.pi4soa.common.eclipse.BundleUtil; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; @@ -212,6 +217,7 @@ * @param configuration The launch configuation * @return The list of classpath entries */ + /* public String[] getClasspath(ILaunchConfiguration configuration) { String[] ret=null; Vector classpathEntries=new Vector(); @@ -277,6 +283,160 @@ return(ret); } + */ + public String[] getClasspath(ILaunchConfiguration configuration) { + String[] ret=null; + java.util.Vector<String> classpathEntries=new java.util.Vector<String>(); + + // Add classpath entry for current Java project + try { + String projname=configuration.getAttribute( + MonitorLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""); + + IProject project= + ResourcesPlugin.getWorkspace().getRoot().getProject(projname); + + IJavaProject jproject=JavaCore.create(project); + + // Add output location + IPath outputLocation=jproject.getOutputLocation(); + + IFolder folder= + ResourcesPlugin.getWorkspace().getRoot().getFolder(outputLocation); + + String path=folder.getLocation().toString(); + + classpathEntries.add(path); + + // Add other libraries to the classpath + IClasspathEntry[] curclspath=jproject.getRawClasspath(); + for (int i=0; curclspath != null && + i < curclspath.length; i++) { + + if (curclspath[i].getEntryKind() == IClasspathEntry.CPE_LIBRARY) { + IFile file= + ResourcesPlugin.getWorkspace(). + getRoot().getFile(curclspath[i].getPath()); + + if (file.exists()) { + // Library is within the workspace + classpathEntries.add(file.getLocation().toString()); + } else { + // Assume library is external to workspace + classpathEntries.add(curclspath[i].getPath().toString()); + } + + } else if (curclspath[i].getEntryKind() == + IClasspathEntry.CPE_CONTAINER) { + // Container's not currently handled - but + // problem need to retrieve from project and + // iterate over container entries + } + } + + } catch(Exception e) { + // TODO: report error + } + + buildClassPath("org.pi4soa.monitor", classpathEntries); + buildClassPath("org.pi4soa.service", classpathEntries); + buildClassPath("org.pi4soa.common", classpathEntries); + buildClassPath("org.pi4soa.cdl", classpathEntries); + buildClassPath("org.eclipse.emf.ecore", classpathEntries); + buildClassPath("org.eclipse.emf.ecore.xmi", classpathEntries); + buildClassPath("org.eclipse.emf.common", classpathEntries); + buildClassPath("org.apache.xalan", classpathEntries); + buildClassPath("org.apache.xml.serializer", classpathEntries); + + ret = new String[classpathEntries.size()]; + classpathEntries.copyInto(ret); + + if (logger.isLoggable(Level.FINEST)) { + logger.finest("Scenario Simulation Classpath:"); + for (int i=0; i < ret.length; i++) { + logger.finest(" ["+i+"] "+ret[i]); + } + } + + return(ret); + } + + protected void buildClassPath(String bundleId, java.util.List<String> entries) { + Bundle bundle= Platform.getBundle(bundleId); + if (bundle != null) { + java.net.URL installLocation= bundle.getEntry("/"); + java.net.URL local= null; + try { + local= Platform.asLocalURL(installLocation); + } catch (java.io.IOException e) { + e.printStackTrace(); + } + + String baseLocation = local.getFile(); + + try { + String requires = (String)bundle.getHeaders().get(Constants.BUNDLE_CLASSPATH); + ManifestElement[] elements = ManifestElement.parseHeader(Constants.BUNDLE_CLASSPATH, requires); + + for (int i=0; elements != null && i < elements.length; i++) { + + String path=baseLocation+elements[i].getValue(); + + // Check if path is for a Jar and that the + // file exists - if not see if a classes + // directory exists + if (path.endsWith(".jar")) { + + if ((new File(path)).exists() == false) { + if ((new File(baseLocation+"classes")).exists()) { + path = baseLocation+"classes"; + } + } + } + + if (entries.contains(path) == false) { + if (logger.isLoggable(Level.FINE)) { + logger.fine("Adding classpath entry '"+ + path+"'"); + } + entries.add(path); + + if (elements[i].getValue().equals(".")) { + if ((new File(baseLocation+"classes")).exists()) { + path = baseLocation+"classes"; + + entries.add(path); + } + } + } + } + + if (elements == null) { + if (logger.isLoggable(Level.FINE)) { + logger.fine("Adding classpath entry '"+ + baseLocation+"'"); + } + entries.add(baseLocation); + } + + /* + requires = (String)bundle.getHeaders().get(Constants.REQUIRE_BUNDLE); + elements = ManifestElement.parseHeader(Constants.REQUIRE_BUNDLE, requires); + + for (int i=0; recursive && + elements != null && i < elements.length; i++) { + buildClasspathEntries(elements[i].getValue(), + entries, false); + } + */ + + } catch(Exception e) { + logger.severe("Failed to construct classpath: "+e); + e.printStackTrace(); + } + } + } + private static Logger logger = Logger.getLogger("org.pi4soa.monitor.eclipse"); } \ No newline at end of file Modified: tools/eclipse/trunk/plugins/org.pi4soa.monitor/src/java/org/pi4soa/monitor/ui/Monitor.java =================================================================== --- tools/eclipse/trunk/plugins/org.pi4soa.monitor/src/java/org/pi4soa/monitor/ui/Monitor.java 2009-12-07 17:57:30 UTC (rev 117) +++ tools/eclipse/trunk/plugins/org.pi4soa.monitor/src/java/org/pi4soa/monitor/ui/Monitor.java 2009-12-07 23:23:54 UTC (rev 118) @@ -24,6 +24,7 @@ import java.awt.BorderLayout; import java.io.IOException; +import java.util.logging.Level; import java.util.logging.Logger; import org.pi4soa.service.correlator.CorrelationSession; @@ -228,7 +229,7 @@ } catch(Exception e){ // hack - logger.severe("Exception while trying to monitor choreography " + e); + logger.log(Level.SEVERE, "Exception while trying to monitor choreography " + e, e); JOptionPane.showMessageDialog(null, "Failed to initialize monitor: "+e.getLocalizedMessage(),