You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(7) |
Aug
|
Sep
(46) |
Oct
(102) |
Nov
(10) |
Dec
(21) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(1) |
Feb
(3) |
Mar
(14) |
Apr
(9) |
May
(12) |
Jun
(4) |
Jul
(40) |
Aug
(60) |
Sep
(38) |
Oct
(2) |
Nov
(1) |
Dec
(42) |
2008 |
Jan
(23) |
Feb
(29) |
Mar
(107) |
Apr
(27) |
May
(3) |
Jun
(1) |
Jul
(15) |
Aug
(7) |
Sep
(19) |
Oct
|
Nov
(2) |
Dec
|
2009 |
Jan
(36) |
Feb
(4) |
Mar
(2) |
Apr
(1) |
May
(1) |
Jun
(15) |
Jul
(30) |
Aug
(32) |
Sep
(11) |
Oct
(21) |
Nov
(12) |
Dec
(15) |
2010 |
Jan
(29) |
Feb
(9) |
Mar
(25) |
Apr
|
May
(7) |
Jun
(5) |
Jul
(21) |
Aug
(32) |
Sep
(10) |
Oct
(8) |
Nov
(29) |
Dec
(8) |
2011 |
Jan
(9) |
Feb
(35) |
Mar
(11) |
Apr
(4) |
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
(3) |
Dec
(30) |
2012 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <kon...@us...> - 2012-03-22 21:36:45
|
Revision: 1320 http://cishell.svn.sourceforge.net/cishell/?rev=1320&view=rev Author: kongchinhua Date: 2012-03-22 21:36:39 +0000 (Thu, 22 Mar 2012) Log Message: ----------- Added Paths: ----------- trunk/README.MOVED Removed Paths: ------------- trunk/README.txt Copied: trunk/README.MOVED (from rev 1319, trunk/README.txt) =================================================================== --- trunk/README.MOVED (rev 0) +++ trunk/README.MOVED 2012-03-22 21:36:39 UTC (rev 1320) @@ -0,0 +1,2 @@ +As of 2012/03/22 active development of this project will be maintained using a +GitHub repository located at http://github.com/CIShell/CIShell/ Deleted: trunk/README.txt =================================================================== --- trunk/README.txt 2012-03-22 17:10:21 UTC (rev 1319) +++ trunk/README.txt 2012-03-22 21:36:39 UTC (rev 1320) @@ -1,2 +0,0 @@ -As of 2012/03/22 active development of this project will be maintained using a -GitHub repository located at http://github.com/CIShell/CIShell/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dav...@us...> - 2012-03-22 17:10:30
|
Revision: 1319 http://cishell.svn.sourceforge.net/cishell/?rev=1319&view=rev Author: david-coe Date: 2012-03-22 17:10:21 +0000 (Thu, 22 Mar 2012) Log Message: ----------- Moving to GitHub Added Paths: ----------- trunk/README.txt Added: trunk/README.txt =================================================================== --- trunk/README.txt (rev 0) +++ trunk/README.txt 2012-03-22 17:10:21 UTC (rev 1319) @@ -0,0 +1,2 @@ +As of 2012/03/22 active development of this project will be maintained using a +GitHub repository located at http://github.com/CIShell/CIShell/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dav...@us...> - 2012-03-22 14:15:49
|
Revision: 1318 http://cishell.svn.sourceforge.net/cishell/?rev=1318&view=rev Author: david-coe Date: 2012-03-22 14:15:38 +0000 (Thu, 22 Mar 2012) Log Message: ----------- Updated the tag's build to grab from the tag itself. Sorry I missed this earlier! Modified Paths: -------------- tags/final_plugin_builder/deployment/org.cishell.reference.releng/build-files/fetchSvnAll.xml Modified: tags/final_plugin_builder/deployment/org.cishell.reference.releng/build-files/fetchSvnAll.xml =================================================================== --- tags/final_plugin_builder/deployment/org.cishell.reference.releng/build-files/fetchSvnAll.xml 2012-03-22 13:48:22 UTC (rev 1317) +++ tags/final_plugin_builder/deployment/org.cishell.reference.releng/build-files/fetchSvnAll.xml 2012-03-22 14:15:38 UTC (rev 1318) @@ -18,7 +18,7 @@ <param name="element.id" value="org.cishell.feature" /> <param name="project.name" value="deployment/org.cishell.feature" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="features" /> @@ -26,21 +26,21 @@ <param name="project.name" value="deployment/org.cishell.environment.equinox.feature" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="features" /> <param name="element.id" value="org.cishell.reference.feature" /> <param name="project.name" value="deployment/org.cishell.reference.feature" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="features" /> <param name="element.id" value="org.cishell.reference.gui.feature" /> <param name="project.name" value="deployment/org.cishell.reference.gui.feature" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="features" /> @@ -48,21 +48,21 @@ <param name="project.name" value="deployment/org.cishell.reference.gui.brand.feature" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="features" /> <param name="element.id" value="org.cishell.reference.database.feature" /> <param name="project.name" value="deployment/org.cishell.reference.database.feature" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="org.cishell.framework" /> <param name="project.name" value="core/org.cishell.framework" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> @@ -74,70 +74,70 @@ <param name="element.id" value="org.cishell.reference" /> <param name="project.name" value="core/org.cishell.reference" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="org.cishell.reference.services" /> <param name="project.name" value="core/org.cishell.reference.services" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="org.cishell.reference.prefs.admin" /> <param name="project.name" value="core/org.cishell.reference.prefs.admin" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="org.cishell.service.autostart" /> <param name="project.name" value="core/org.cishell.service.autostart" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="org.cishell.algorithm.convertergraph" /> <param name="project.name" value="core/org.cishell.algorithm.convertergraph" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="org.cishell.utilities" /> <param name="project.name" value="core/org.cishell.utilities" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="org.cishell.utility.swt" /> <param name="project.name" value="core/org.cishell.utility.swt" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="org.cishell.utility.datastructure" /> <param name="project.name" value="core/org.cishell.utility.datastructure" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="org.cishell.reference.service.database" /> <param name="project.name" value="core/org.cishell.reference.service.database" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="org.cishell.service.database" /> <param name="project.name" value="core/org.cishell.service.database" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> @@ -149,21 +149,21 @@ <param name="element.id" value="org.cishell.templates" /> <param name="project.name" value="templates/org.cishell.templates" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="org.cishell.templates.jythonrunner" /> <param name="project.name" value="templates/org.cishell.templates.jythonrunner" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="org.cishell.templates.database" /> <param name="project.name" value="templates/org.cishell.templates.database" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> @@ -175,84 +175,84 @@ <param name="element.id" value="edu.uci.ics.jung" /> <param name="project.name" value="libs/edu.uci.ics.jung" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="org.apache.commons.collections" /> <param name="project.name" value="libs/org.apache.commons.collections" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="commons_dbcp" /> <param name="project.name" value="libs/commons_dbcp" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="commons_pool" /> <param name="project.name" value="libs/commons_pool" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="derbylib" /> <param name="project.name" value="libs/derbylib" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="hsqldb" /> <param name="project.name" value="libs/hsqldb" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="cern.colt" /> <param name="project.name" value="libs/cern.colt" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="jythonlib" /> <param name="project.name" value="libs/jythonlib" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="com.google.guava" /> <param name="project.name" value="libs/com.google.guava" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="org.prefuse.lib" /> <param name="project.name" value="libs/prefuselib" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="joda-time" /> <param name="project.name" value="libs/joda-time" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="opencsv" /> <param name="project.name" value="libs/opencsv" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> @@ -265,42 +265,42 @@ <param name="project.name" value="clients/gui/org.cishell.reference.gui.brand.cishell" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="org.cishell.reference.gui.datamanager" /> <param name="project.name" value="clients/gui/org.cishell.reference.gui.datamanager" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="org.cishell.reference.gui.log" /> <param name="project.name" value="clients/gui/org.cishell.reference.gui.log" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="org.cishell.reference.gui.menumanager" /> <param name="project.name" value="clients/gui/org.cishell.reference.gui.menumanager" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="org.cishell.reference.gui.prefs.swt" /> <param name="project.name" value="clients/gui/org.cishell.reference.gui.prefs.swt" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="org.cishell.reference.gui.workspace" /> <param name="project.name" value="clients/gui/org.cishell.reference.gui.workspace" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> @@ -308,21 +308,21 @@ <param name="project.name" value="clients/gui/org.cishell.reference.gui.guibuilder.swt" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="org.cishell.reference.gui.persistence" /> <param name="project.name" value="clients/gui/org.cishell.reference.gui.persistence" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="org.cishell.reference.gui.scheduler" /> <param name="project.name" value="clients/gui/org.cishell.reference.gui.scheduler" /> <param name="url" - value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> + value="https://cishell.svn.sourceforge.net/svnroot/cishell/tags/final_plugin_builder" /> </antcall> </target> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dav...@us...> - 2012-03-22 13:48:31
|
Revision: 1317 http://cishell.svn.sourceforge.net/cishell/?rev=1317&view=rev Author: david-coe Date: 2012-03-22 13:48:22 +0000 (Thu, 22 Mar 2012) Log Message: ----------- The last version to build with plugin builder build system. Added Paths: ----------- tags/final_plugin_builder/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dav...@us...> - 2012-03-20 16:19:29
|
Revision: 1316 http://cishell.svn.sourceforge.net/cishell/?rev=1316&view=rev Author: david-coe Date: 2012-03-20 16:19:20 +0000 (Tue, 20 Mar 2012) Log Message: ----------- Adding .classpath to conform with other projects. Modified Paths: -------------- trunk/libs/prefuselib/.classpath Modified: trunk/libs/prefuselib/.classpath =================================================================== --- trunk/libs/prefuselib/.classpath 2012-03-20 15:59:50 UTC (rev 1315) +++ trunk/libs/prefuselib/.classpath 2012-03-20 16:19:20 UTC (rev 1316) @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry exported="true" kind="lib" path="prefuse.jar"/> + <classpathentry exported="true" kind="lib" path="prefuse.jar"> + <attributes> + <attribute name="javadoc_location" value="http://prefuse.org/doc/api/"/> + </attributes> + </classpathentry> <classpathentry exported="true" kind="lib" path="prefuse-alpha-20060526.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dav...@us...> - 2012-03-20 16:00:01
|
Revision: 1315 http://cishell.svn.sourceforge.net/cishell/?rev=1315&view=rev Author: david-coe Date: 2012-03-20 15:59:50 +0000 (Tue, 20 Mar 2012) Log Message: ----------- Since the method overrode equals, it should also override hashcode. Reviewed by Joseph. Modified Paths: -------------- trunk/core/org.cishell.reference/src/org/cishell/reference/app/service/scheduler/SchedulerServiceImpl.java Modified: trunk/core/org.cishell.reference/src/org/cishell/reference/app/service/scheduler/SchedulerServiceImpl.java =================================================================== --- trunk/core/org.cishell.reference/src/org/cishell/reference/app/service/scheduler/SchedulerServiceImpl.java 2012-03-20 15:18:36 UTC (rev 1314) +++ trunk/core/org.cishell.reference/src/org/cishell/reference/app/service/scheduler/SchedulerServiceImpl.java 2012-03-20 15:59:50 UTC (rev 1315) @@ -33,6 +33,8 @@ import org.cishell.reference.app.service.scheduler.AlgorithmTask.AlgorithmState; import org.osgi.framework.ServiceReference; +import com.google.common.base.Objects; + /** * A simple scheduler based on {@link java.util.Timer}. * @@ -647,6 +649,9 @@ } } + /** + * Overrides the equals method to only use the name field. + */ static class AlgorithmState { /** New algorithms are in this state. */ public static final AlgorithmState NEW = new AlgorithmState("NEW", false) { @@ -702,17 +707,35 @@ this.isCanceled = isCanceled; } - public final boolean equals(Object object) { - if (!(object instanceof AlgorithmState)) { - return false; - } - AlgorithmState state = (AlgorithmState) object; + /* Only uses the name field. + */ + @Override + public int hashCode() { + return Objects.hashCode(this.name); + } - return state.name.compareTo(name) == 0; - } - public void performAction( + /* + * Only uses the name field. + */ + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (!(obj instanceof AlgorithmState)) { + return false; + } + AlgorithmState other = (AlgorithmState) obj; + return Objects.equal(this.name, other.name); + } + + + public void performAction( Algorithm algorithm, SchedulerListener schedulerListener, Calendar scheduledTime, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dav...@us...> - 2012-03-20 15:18:47
|
Revision: 1314 http://cishell.svn.sourceforge.net/cishell/?rev=1314&view=rev Author: david-coe Date: 2012-03-20 15:18:36 +0000 (Tue, 20 Mar 2012) Log Message: ----------- Removed a poorly written and unused 'equals' function that really did something else. Reviewed by Thomas. Modified Paths: -------------- trunk/core/org.cishell.reference.service.database/src/org/cishell/reference/service/database/utility/JDBC.java Modified: trunk/core/org.cishell.reference.service.database/src/org/cishell/reference/service/database/utility/JDBC.java =================================================================== --- trunk/core/org.cishell.reference.service.database/src/org/cishell/reference/service/database/utility/JDBC.java 2012-03-20 15:15:17 UTC (rev 1313) +++ trunk/core/org.cishell.reference.service.database/src/org/cishell/reference/service/database/utility/JDBC.java 2012-03-20 15:18:36 UTC (rev 1314) @@ -49,46 +49,6 @@ * The base level for the Derby tests is JSR 169. */ public class JDBC { - - /** - * Helper class whose <code>equals()</code> method returns - * <code>true</code> for all strings on this format: SQL061021105830900 - */ - public static class GeneratedId { - public boolean equals(Object o) { - // unless JSR169, use String.matches... - if (JDBC.vmSupportsJDBC3()) - { - return o instanceof String && - ((String) o).matches("SQL[0-9]{15}"); - } - else - { - String tmpstr = (String)o; - boolean b = true; - if (!(o instanceof String)) - b = false; - if (!(tmpstr.startsWith("SQL"))) - b = false; - if (tmpstr.length() != 18) - b = false; - for (int i=3 ; i<18 ; i++) - { - if (Character.isDigit(tmpstr.charAt(i))) - continue; - else - { - b = false; - break; - } - } - return b; - } - } - public String toString() { - return "xxxxGENERATED-IDxxxx"; - } - } /** * Constant to pass to DatabaseMetaData.getTables() to fetch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dav...@us...> - 2012-03-20 15:15:26
|
Revision: 1313 http://cishell.svn.sourceforge.net/cishell/?rev=1313&view=rev Author: david-coe Date: 2012-03-20 15:15:17 +0000 (Tue, 20 Mar 2012) Log Message: ----------- Exposed the plugin to a friend plugin so the test utilities could use the database service. Reviewed by Thomas Modified Paths: -------------- trunk/core/org.cishell.reference.service.database/META-INF/MANIFEST.MF Modified: trunk/core/org.cishell.reference.service.database/META-INF/MANIFEST.MF =================================================================== --- trunk/core/org.cishell.reference.service.database/META-INF/MANIFEST.MF 2012-03-07 14:01:35 UTC (rev 1312) +++ trunk/core/org.cishell.reference.service.database/META-INF/MANIFEST.MF 2012-03-20 15:15:17 UTC (rev 1313) @@ -21,3 +21,4 @@ org.osgi.util.tracker;version="1.3.3" Service-Component: OSGI-INF/component.xml Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Export-Package: org.cishell.reference.service.database;x-friends:="edu.iu.sci2.testutilities" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dav...@us...> - 2012-03-07 14:01:46
|
Revision: 1312 http://cishell.svn.sourceforge.net/cishell/?rev=1312&view=rev Author: david-coe Date: 2012-03-07 14:01:35 +0000 (Wed, 07 Mar 2012) Log Message: ----------- You can optionally create a registry that will not recycle the colors. Reviewed by Chin Hua. Modified Paths: -------------- trunk/core/org.cishell.utilities/src/org/cishell/utilities/color/ColorRegistry.java Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/color/ColorRegistry.java =================================================================== --- trunk/core/org.cishell.utilities/src/org/cishell/utilities/color/ColorRegistry.java 2012-03-06 22:05:17 UTC (rev 1311) +++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/color/ColorRegistry.java 2012-03-07 14:01:35 UTC (rev 1312) @@ -21,9 +21,15 @@ private int currentIndex; private ColorSchema colorSchema; private Map<K, Color> registedColors; + private boolean recycleColor; public ColorRegistry(ColorSchema colorSchema) { + this(colorSchema, true); + } + + public ColorRegistry(ColorSchema colorSchema, boolean recycleColor) { this.currentIndex = 0; + this.recycleColor = recycleColor; this.colorSchema = colorSchema; this.registedColors = new HashMap<K, Color>(); } @@ -33,7 +39,7 @@ * @return Return the registered keys */ public Set<K> getKeySet() { - return registedColors.keySet(); + return this.registedColors.keySet(); } /** @@ -44,11 +50,10 @@ * color defined by the ColorSchema will be returned */ public Color getColorOf(K key) { - if (registedColors.containsKey(key)) { - return registedColors.get(key); - } else { - return reserveColorFor(key); + if (this.registedColors.containsKey(key)) { + return this.registedColors.get(key); } + return reserveColorFor(key); } /** @@ -56,14 +61,14 @@ * @return the default color. */ public Color getDefaultColor() { - return colorSchema.getDefaultColor(); + return this.colorSchema.getDefaultColor(); } /** * Clear all entry and reset to initial state. */ public void clear() { - registedColors.clear(); + this.registedColors.clear(); } /* @@ -71,22 +76,24 @@ */ private Color reserveColorFor(K key) { - Color color = colorSchema.get(getNextIndex()); - registedColors.put(key, color); + Color color = this.colorSchema.get(getNextIndex()); + this.registedColors.put(key, color); return color; } /* - * Return next color index. This will reuse the color if it out of color + * Return next color index. This will recycle the color + * if the recycleColor is true */ private int getNextIndex() { - int index = currentIndex; + int index = this.currentIndex; - if (currentIndex < colorSchema.size() - 1) { - currentIndex++; + if (this.currentIndex < this.colorSchema.size() - 1 + || !this.recycleColor) { + this.currentIndex++; } else { - currentIndex = 0; + this.currentIndex = 0; } return index; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dav...@us...> - 2012-03-06 22:05:24
|
Revision: 1311 http://cishell.svn.sourceforge.net/cishell/?rev=1311&view=rev Author: david-coe Date: 2012-03-06 22:05:17 +0000 (Tue, 06 Mar 2012) Log Message: ----------- changed isempty() to .length == 0 since isempty was not available in Java 1.5 See http://docs.oracle.com/javase/6/docs/api/java/lang/String.html#isEmpty%28%29 Reviewed by Chin Hua Modified Paths: -------------- trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/ProcessReport.java Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/ProcessReport.java =================================================================== --- trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/ProcessReport.java 2012-02-24 00:58:58 UTC (rev 1310) +++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/ProcessReport.java 2012-03-06 22:05:17 UTC (rev 1311) @@ -98,7 +98,7 @@ } private static String reportStreamContents(String streamName, String contents) { - if (contents.isEmpty()) { + if (contents.length() == 0) { return String.format("No messages to %s.", streamName); } else { return String.format("Message to %s: [[%s]].", streamName, contents); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jrb...@us...> - 2012-02-24 00:59:04
|
Revision: 1310 http://cishell.svn.sourceforge.net/cishell/?rev=1310&view=rev Author: jrbibers Date: 2012-02-24 00:58:58 +0000 (Fri, 24 Feb 2012) Log Message: ----------- Updating CIShell feature configurations to use new Guava bundle name "com.google.guava". Modified Paths: -------------- trunk/deployment/org.cishell.reference.database.feature/feature.xml trunk/deployment/org.cishell.reference.feature/feature.xml Modified: trunk/deployment/org.cishell.reference.database.feature/feature.xml =================================================================== --- trunk/deployment/org.cishell.reference.database.feature/feature.xml 2012-02-24 00:56:07 UTC (rev 1309) +++ trunk/deployment/org.cishell.reference.database.feature/feature.xml 2012-02-24 00:58:58 UTC (rev 1310) @@ -103,7 +103,7 @@ unpack="false"/> <plugin - id="google_guava" + id="com.google.guava" download-size="0" install-size="0" version="0.0.0"/> Modified: trunk/deployment/org.cishell.reference.feature/feature.xml =================================================================== --- trunk/deployment/org.cishell.reference.feature/feature.xml 2012-02-24 00:56:07 UTC (rev 1309) +++ trunk/deployment/org.cishell.reference.feature/feature.xml 2012-02-24 00:58:58 UTC (rev 1310) @@ -143,7 +143,7 @@ unpack="false"/> <plugin - id="google_guava" + id="com.google.guava" download-size="0" install-size="0" version="0.0.0"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jrb...@us...> - 2012-02-24 00:56:13
|
Revision: 1309 http://cishell.svn.sourceforge.net/cishell/?rev=1309&view=rev Author: jrbibers Date: 2012-02-24 00:56:07 +0000 (Fri, 24 Feb 2012) Log Message: ----------- Updating repository path from "google_guava" to "com.google.guava". Modified Paths: -------------- trunk/deployment/org.cishell.reference.releng/build-files/fetchSvnAll.xml Modified: trunk/deployment/org.cishell.reference.releng/build-files/fetchSvnAll.xml =================================================================== --- trunk/deployment/org.cishell.reference.releng/build-files/fetchSvnAll.xml 2012-02-24 00:53:45 UTC (rev 1308) +++ trunk/deployment/org.cishell.reference.releng/build-files/fetchSvnAll.xml 2012-02-24 00:56:07 UTC (rev 1309) @@ -229,7 +229,7 @@ <antcall target="svn.co"> <param name="target" value="plugins" /> <param name="element.id" value="com.google.guava" /> - <param name="project.name" value="libs/google_guava" /> + <param name="project.name" value="libs/com.google.guava" /> <param name="url" value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> </antcall> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jrb...@us...> - 2012-02-24 00:53:51
|
Revision: 1308 http://cishell.svn.sourceforge.net/cishell/?rev=1308&view=rev Author: jrbibers Date: 2012-02-24 00:53:45 +0000 (Fri, 24 Feb 2012) Log Message: ----------- Updating repository location "google_guava" to match new bundle name "com.google.guava". See CIShell SVN revision 1307. Revision Links: -------------- http://cishell.svn.sourceforge.net/cishell/?rev=1307&view=rev Added Paths: ----------- trunk/libs/com.google.guava/ Removed Paths: ------------- trunk/libs/google_guava/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jrb...@us...> - 2012-02-24 00:49:58
|
Revision: 1307 http://cishell.svn.sourceforge.net/cishell/?rev=1307&view=rev Author: jrbibers Date: 2012-02-24 00:49:51 +0000 (Fri, 24 Feb 2012) Log Message: ----------- Updating Guava from 8 from 11.0.1. Renaming project from "google_guava" to "com.google.guava". Modified Paths: -------------- trunk/deployment/org.cishell.reference.releng/build-files/fetchSvnAll.xml trunk/libs/google_guava/.classpath trunk/libs/google_guava/.project trunk/libs/google_guava/META-INF/MANIFEST.MF trunk/libs/google_guava/Updating.txt trunk/libs/google_guava/build.properties Added Paths: ----------- trunk/libs/google_guava/com.google.guava.source_11.0.1.jar trunk/libs/google_guava/com.google.guava_11.0.1.jar Removed Paths: ------------- trunk/libs/google_guava/guava-r08.jar trunk/libs/google_guava/guava-src-r08.zip Modified: trunk/deployment/org.cishell.reference.releng/build-files/fetchSvnAll.xml =================================================================== --- trunk/deployment/org.cishell.reference.releng/build-files/fetchSvnAll.xml 2012-02-01 23:12:12 UTC (rev 1306) +++ trunk/deployment/org.cishell.reference.releng/build-files/fetchSvnAll.xml 2012-02-24 00:49:51 UTC (rev 1307) @@ -228,7 +228,7 @@ </antcall> <antcall target="svn.co"> <param name="target" value="plugins" /> - <param name="element.id" value="google_guava" /> + <param name="element.id" value="com.google.guava" /> <param name="project.name" value="libs/google_guava" /> <param name="url" value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk" /> Modified: trunk/libs/google_guava/.classpath =================================================================== --- trunk/libs/google_guava/.classpath 2012-02-01 23:12:12 UTC (rev 1306) +++ trunk/libs/google_guava/.classpath 2012-02-24 00:49:51 UTC (rev 1307) @@ -2,9 +2,9 @@ <classpath> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry exported="true" kind="lib" path="guava-r08.jar" sourcepath="guava-src-r08.zip"> - <attributes> - <attribute name="javadoc_location" value="http://guava-libraries.googlecode.com/svn/tags/release08/javadoc"/> + <classpathentry exported="true" kind="lib" path="com.google.guava_11.0.1.jar" sourcepath="com.google.guava.source_11.0.1.jar"> + <attributes> + <attribute name="javadoc_location" value="http://docs.guava-libraries.googlecode.com/git-history/v11.0.1/javadoc"/> </attributes> <accessrules> <accessrule kind="discouraged" pattern="com/google/common/base/internal/*"/> Modified: trunk/libs/google_guava/.project =================================================================== --- trunk/libs/google_guava/.project 2012-02-01 23:12:12 UTC (rev 1306) +++ trunk/libs/google_guava/.project 2012-02-24 00:49:51 UTC (rev 1307) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>google_guava</name> + <name>com.google.guava</name> <comment></comment> <projects> </projects> Modified: trunk/libs/google_guava/META-INF/MANIFEST.MF =================================================================== --- trunk/libs/google_guava/META-INF/MANIFEST.MF 2012-02-01 23:12:12 UTC (rev 1306) +++ trunk/libs/google_guava/META-INF/MANIFEST.MF 2012-02-24 00:49:51 UTC (rev 1307) @@ -1,15 +1,19 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: google_guava -Bundle-SymbolicName: google_guava -Bundle-Version: 8.0.0 -Bundle-ClassPath: guava-r08.jar -Export-Package: com.google.common.annotations;version="8.0.0", - com.google.common.base;version="8.0.0", - com.google.common.base.internal;version="8.0.0", - com.google.common.collect;version="8.0.0", - com.google.common.io;version="8.0.0", - com.google.common.net;version="8.0.0", - com.google.common.primitives;version="8.0.0", - com.google.common.util.concurrent;version="8.0.0" +Bundle-Name: com.google.guava +Bundle-SymbolicName: com.google.guava +Bundle-Version: 11.0.1 +Bundle-ClassPath: com.google.guava_11.0.1.jar +Export-Package: com.google.common.annotations;version="11.0.1", + com.google.common.base;version="11.0.1", + com.google.common.base.internal;version="11.0.1", + com.google.common.cache;version="11.0.1", + com.google.common.collect;version="11.0.1", + com.google.common.eventbus;version="11.0.1", + com.google.common.hash;version="11.0.1", + com.google.common.io;version="11.0.1", + com.google.common.math;version="11.0.1", + com.google.common.net;version="11.0.1", + com.google.common.primitives;version="11.0.1", + com.google.common.util.concurrent;version="11.0.1" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/libs/google_guava/Updating.txt =================================================================== --- trunk/libs/google_guava/Updating.txt 2012-02-01 23:12:12 UTC (rev 1306) +++ trunk/libs/google_guava/Updating.txt 2012-02-24 00:49:51 UTC (rev 1307) @@ -4,4 +4,8 @@ http://code.google.com/p/guava-osgi/ We've set up the Export-Package: part of the Manifest to use -version numbers that are compatible with that project. \ No newline at end of file +version numbers that are compatible with that project. + +Last updated 2012-02-23 from: +http://guava-osgi.googlecode.com/svn/trunk/repository/plugins/com.google.guava_11.0.1.jar +http://guava-osgi.googlecode.com/svn/trunk/repository/plugins/com.google.guava.source_11.0.1.jar \ No newline at end of file Modified: trunk/libs/google_guava/build.properties =================================================================== --- trunk/libs/google_guava/build.properties 2012-02-01 23:12:12 UTC (rev 1306) +++ trunk/libs/google_guava/build.properties 2012-02-24 00:49:51 UTC (rev 1307) @@ -1,2 +1,2 @@ bin.includes = META-INF/,\ - guava-r08.jar + com.google.guava_11.0.1.jar Added: trunk/libs/google_guava/com.google.guava.source_11.0.1.jar =================================================================== (Binary files differ) Property changes on: trunk/libs/google_guava/com.google.guava.source_11.0.1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/libs/google_guava/com.google.guava_11.0.1.jar =================================================================== (Binary files differ) Property changes on: trunk/libs/google_guava/com.google.guava_11.0.1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/libs/google_guava/guava-r08.jar =================================================================== (Binary files differ) Deleted: trunk/libs/google_guava/guava-src-r08.zip =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dav...@us...> - 2012-02-01 23:12:19
|
Revision: 1306 http://cishell.svn.sourceforge.net/cishell/?rev=1306&view=rev Author: david-coe Date: 2012-02-01 23:12:12 +0000 (Wed, 01 Feb 2012) Log Message: ----------- Adding Apache's Commons IO. Added Paths: ----------- trunk/libs/org.apache.commons.io/.classpath trunk/libs/org.apache.commons.io/.project trunk/libs/org.apache.commons.io/.settings/ trunk/libs/org.apache.commons.io/.settings/org.eclipse.jdt.core.prefs trunk/libs/org.apache.commons.io/.settings/org.eclipse.pde.core.prefs trunk/libs/org.apache.commons.io/META-INF/ trunk/libs/org.apache.commons.io/META-INF/MANIFEST.MF trunk/libs/org.apache.commons.io/build.properties trunk/libs/org.apache.commons.io/lib/ trunk/libs/org.apache.commons.io/lib/commons-io-2.1-javadoc.jar trunk/libs/org.apache.commons.io/lib/commons-io-2.1-sources.jar trunk/libs/org.apache.commons.io/lib/commons-io-2.1.jar trunk/libs/org.apache.commons.io/src/ Added: trunk/libs/org.apache.commons.io/.classpath =================================================================== --- trunk/libs/org.apache.commons.io/.classpath (rev 0) +++ trunk/libs/org.apache.commons.io/.classpath 2012-02-01 23:12:12 UTC (rev 1306) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry exported="true" kind="lib" path="lib/commons-io-2.1.jar" sourcepath="lib/commons-io-2.1-sources.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:platform:/resource/org.apache.commons.io/lib/commons-io-2.1-javadoc.jar!/"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: trunk/libs/org.apache.commons.io/.project =================================================================== --- trunk/libs/org.apache.commons.io/.project (rev 0) +++ trunk/libs/org.apache.commons.io/.project 2012-02-01 23:12:12 UTC (rev 1306) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.apache.commons.io</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: trunk/libs/org.apache.commons.io/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/libs/org.apache.commons.io/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/libs/org.apache.commons.io/.settings/org.eclipse.jdt.core.prefs 2012-02-01 23:12:12 UTC (rev 1306) @@ -0,0 +1,8 @@ +#Wed Feb 01 17:53:55 EST 2012 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 Added: trunk/libs/org.apache.commons.io/.settings/org.eclipse.pde.core.prefs =================================================================== --- trunk/libs/org.apache.commons.io/.settings/org.eclipse.pde.core.prefs (rev 0) +++ trunk/libs/org.apache.commons.io/.settings/org.eclipse.pde.core.prefs 2012-02-01 23:12:12 UTC (rev 1306) @@ -0,0 +1,4 @@ +#Wed Feb 01 17:53:55 EST 2012 +eclipse.preferences.version=1 +pluginProject.extensions=false +resolve.requirebundle=false Added: trunk/libs/org.apache.commons.io/META-INF/MANIFEST.MF =================================================================== --- trunk/libs/org.apache.commons.io/META-INF/MANIFEST.MF (rev 0) +++ trunk/libs/org.apache.commons.io/META-INF/MANIFEST.MF 2012-02-01 23:12:12 UTC (rev 1306) @@ -0,0 +1,13 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: org.apache.commons.io +Bundle-SymbolicName: org.apache.commons.io +Bundle-Version: 2.1 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-ClassPath: lib/commons-io-2.1.jar +Export-Package: org.apache.commons.io;version="2.1.0", + org.apache.commons.io.comparator;version="2.1.0", + org.apache.commons.io.filefilter;version="2.1.0", + org.apache.commons.io.input;version="2.1.0", + org.apache.commons.io.monitor;version="2.1.0", + org.apache.commons.io.output;version="2.1.0" Added: trunk/libs/org.apache.commons.io/build.properties =================================================================== --- trunk/libs/org.apache.commons.io/build.properties (rev 0) +++ trunk/libs/org.apache.commons.io/build.properties 2012-02-01 23:12:12 UTC (rev 1306) @@ -0,0 +1,3 @@ +output.. = bin/ +bin.includes = META-INF/,\ + lib/commons-io-2.1.jar Added: trunk/libs/org.apache.commons.io/lib/commons-io-2.1-javadoc.jar =================================================================== (Binary files differ) Property changes on: trunk/libs/org.apache.commons.io/lib/commons-io-2.1-javadoc.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/libs/org.apache.commons.io/lib/commons-io-2.1-sources.jar =================================================================== (Binary files differ) Property changes on: trunk/libs/org.apache.commons.io/lib/commons-io-2.1-sources.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/libs/org.apache.commons.io/lib/commons-io-2.1.jar =================================================================== (Binary files differ) Property changes on: trunk/libs/org.apache.commons.io/lib/commons-io-2.1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dav...@us...> - 2012-02-01 23:11:27
|
Revision: 1305 http://cishell.svn.sourceforge.net/cishell/?rev=1305&view=rev Author: david-coe Date: 2012-02-01 23:11:20 +0000 (Wed, 01 Feb 2012) Log Message: ----------- Initial import. Added Paths: ----------- trunk/libs/org.apache.commons.io/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dav...@us...> - 2012-02-01 15:41:38
|
Revision: 1304 http://cishell.svn.sourceforge.net/cishell/?rev=1304&view=rev Author: david-coe Date: 2012-02-01 15:41:27 +0000 (Wed, 01 Feb 2012) Log Message: ----------- Added some nice features such as getting a tempdirectory given a prefix for the directory name and reading a stream into a file. Reviewed by Thomas. Modified Paths: -------------- trunk/core/org.cishell.utilities/src/org/cishell/utilities/FileUtilities.java Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/FileUtilities.java =================================================================== --- trunk/core/org.cishell.utilities/src/org/cishell/utilities/FileUtilities.java 2012-01-30 23:56:55 UTC (rev 1303) +++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/FileUtilities.java 2012-02-01 15:41:27 UTC (rev 1304) @@ -58,6 +58,36 @@ return ensureDirectoryExists(fullDirectoryPath); } + /** + * Adapted from Google Guava. + * + * This will attempt to return you a temp directory in Java's temp + * directory. This method assumes that the temporary volume is writable, has + * free inodes and free blocks, and that it will not be called thousands of + * times per second. + * + * @param prefix + * A string that will appear at the beginning of a directories + * name. + */ + public static File createTempDirectory(String prefix) { + final int TEMP_DIR_ATTEMPTS = 1000; + File baseDir = new File(getDefaultTemporaryDirectory()); + String baseName = prefix + "-" + System.currentTimeMillis() + "-"; + + for (int counter = 0; counter < TEMP_DIR_ATTEMPTS; counter++) { + File tempDir = new File(baseDir, baseName + counter); + if (tempDir.mkdir()) { + return tempDir; + } + } + throw new IllegalStateException("Failed to create directory within " + + TEMP_DIR_ATTEMPTS + " attempts (tried " + + baseName + "0 to " + baseName + (TEMP_DIR_ATTEMPTS - 1) + ')'); + + } + + // Attempt to create a temporary file on disk whose name is passed in. public static File createTemporaryFile(File temporaryDirectory, String temporaryDirectoryPath, @@ -91,6 +121,10 @@ throw new RuntimeException(e2); } + /* + * FIXME this is very very very bad if the machine will be left running for long periods of time... + * See: http://www.pongasoft.com/blog/yan/java/2011/05/17/file-dot-deleteOnExit-is-evil/ + */ temporaryFile.deleteOnExit(); } } @@ -307,22 +341,29 @@ throws IOException { File temporaryFile = createTemporaryFile(directory, directory.getAbsolutePath(), fileName, fileExtension); - OutputStream output = new FileOutputStream(temporaryFile); - // TODO: Use READ_TEXT_FILE_BUFFER_SIZE. - byte[] readCharacters = new byte[1]; - int readCharacterCount = input.read(readCharacters); - - while (readCharacterCount > 0) { - output.write(readCharacters, 0, readCharacterCount); - readCharacterCount = input.read(readCharacters); - } - - output.close(); - input.close(); - - return temporaryFile; + return writeStreamToFile(input, temporaryFile); } + /** + * Read the input stream into the output file and return the file. + */ + public static File writeStreamToFile(InputStream input, File outputFile) + throws IOException { + OutputStream output = new FileOutputStream(outputFile); + // TODO: Use READ_TEXT_FILE_BUFFER_SIZE. + byte[] readCharacters = new byte[1]; + int readCharacterCount = input.read(readCharacters); + + while (readCharacterCount > 0) { + output.write(readCharacters, 0, readCharacterCount); + readCharacterCount = input.read(readCharacters); + } + + output.close(); + input.close(); + return outputFile; + } + public static String getFileExtension(File file) { return getFileExtension(file.getAbsolutePath()); } @@ -455,7 +496,7 @@ return cleanedFilename; } - + public static String extractFileName(String fileLabel) { //index variables will be -1 if index is not found. int descriptionEndIndex = fileLabel.lastIndexOf(":"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dav...@us...> - 2012-01-30 23:57:02
|
Revision: 1303 http://cishell.svn.sourceforge.net/cishell/?rev=1303&view=rev Author: david-coe Date: 2012-01-30 23:56:55 +0000 (Mon, 30 Jan 2012) Log Message: ----------- Each method here that used a deprecated method was deprecated. You are strongly urged to use JodaTime and utilities that use JodaTime rather than the java util Date class. Modified Paths: -------------- trunk/core/org.cishell.utilities/src/org/cishell/utilities/DateUtilities.java Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/DateUtilities.java =================================================================== --- trunk/core/org.cishell.utilities/src/org/cishell/utilities/DateUtilities.java 2012-01-27 00:05:56 UTC (rev 1302) +++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/DateUtilities.java 2012-01-30 23:56:55 UTC (rev 1303) @@ -19,6 +19,7 @@ (365.24 * 24 * 60 * 60 * 1000 / 12); // TODO: Is this actually necessary? + @Deprecated public static Date[] generateDaysBetweenDates(Date startDate, Date endDate) { GregorianCalendar startDateCalendar = new GregorianCalendar(startDate.getYear() + 1900, @@ -78,6 +79,7 @@ return dateSet.length; } + @Deprecated public static int calculateDaysBetween(Date startDate, Date endDate) { FAQCalendar startDateCalendar = new FAQCalendar(startDate.getYear(), startDate.getMonth(), @@ -105,6 +107,7 @@ } // Assumes dateSet is sorted from earliest to latest. + @Deprecated public static Date[] getNewYearsDatesFromDateSet(Date[] dateSet) { ArrayList workingNewYearsDates = new ArrayList(); @@ -129,6 +132,7 @@ return (Date[])workingNewYearsDates.toArray(finalNewYearsDates); } + @Deprecated public static Date[] generateNewYearsDatesBetweenDates(Date startDate, Date endDate) { @@ -150,6 +154,7 @@ } // TODO: This could also REALLY be improved. + @Deprecated public static Date[] generateFirstOfTheMonthDatesBetweenDates(Date[] dateSet) { ArrayList workingFirstOfTheMonthDates = new ArrayList(); @@ -166,6 +171,7 @@ (finalFirstOfTheMonthDates); } + @Deprecated public static Date[] generateFirstOfTheMonthDatesBetweenDates(Date startDate, Date endDate) { @@ -222,20 +228,24 @@ DateFormat.getDateInstance(DateFormat.LONG), }; + @Deprecated public static Date parseDate(String dateString) throws ParseException { return parseDate(dateString, true); } + @Deprecated public static Date parseDate(String dateString, boolean fixYear) throws ParseException { return (parseDate(dateString, MONTH_DAY_YEAR_DATE_FORMATS, fixYear)); } + @Deprecated public static Date parseDate(String dateString, String suggestedDateFormat) throws ParseException { return parseDate(dateString, suggestedDateFormat, true); } + @Deprecated public static Date parseDate( String dateString, String suggestedDateFormat, boolean fixYear) throws ParseException { @@ -252,11 +262,13 @@ } } + @Deprecated public static Date parseDate(String dateString, DateFormat[] dateFormats) throws ParseException { return parseDate(dateString, dateFormats, true); } + @Deprecated public static Date parseDate( String dateString, DateFormat[] dateFormats, boolean fixYear) throws ParseException { @@ -284,16 +296,19 @@ throw new ParseException(exceptionMessage, 0); } + @Deprecated public static Date interpretObjectAsDate(Object object) throws ParseException { return interpretObjectAsDate(object, ""); } + @Deprecated public static Date interpretObjectAsDate(Object object, String dateFormat) throws ParseException { return interpretObjectAsDate(object, dateFormat, true); } + @Deprecated public static Date interpretObjectAsDate( Object object, String dateFormat, boolean fixYear) throws ParseException { @@ -381,6 +396,7 @@ return parseDate(objectAsString.trim(), dateFormat, fixYear); } + @Deprecated private static Date fixDateYear(Date date) { if (date.getYear() < 1900) { Date fixedDate = (Date)date.clone(); @@ -391,4 +407,5 @@ return date; } } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dav...@us...> - 2012-01-27 00:06:02
|
Revision: 1302 http://cishell.svn.sourceforge.net/cishell/?rev=1302&view=rev Author: david-coe Date: 2012-01-27 00:05:56 +0000 (Fri, 27 Jan 2012) Log Message: ----------- I added a way to access the default color for the colorschema from the colorregistry. reviewed by joseph. Modified Paths: -------------- trunk/core/org.cishell.utilities/src/org/cishell/utilities/color/ColorRegistry.java Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/color/ColorRegistry.java =================================================================== --- trunk/core/org.cishell.utilities/src/org/cishell/utilities/color/ColorRegistry.java 2012-01-20 19:12:00 UTC (rev 1301) +++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/color/ColorRegistry.java 2012-01-27 00:05:56 UTC (rev 1302) @@ -41,7 +41,7 @@ * @param key - key must be type of <E> * @return Return color that assigned to the specific * key. If all the colors are fully used, the default - * color denied by the ColorSchema will be returned + * color defined by the ColorSchema will be returned */ public Color getColorOf(K key) { if (registedColors.containsKey(key)) { @@ -52,6 +52,14 @@ } /** + * Request the default color as defined by the ColorSchema. + * @return the default color. + */ + public Color getDefaultColor() { + return colorSchema.getDefaultColor(); + } + + /** * Clear all entry and reset to initial state. */ public void clear() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jrb...@us...> - 2012-01-20 19:12:09
|
Revision: 1301 http://cishell.svn.sourceforge.net/cishell/?rev=1301&view=rev Author: jrbibers Date: 2012-01-20 19:12:00 +0000 (Fri, 20 Jan 2012) Log Message: ----------- Added a "commands" field to ProcessResult that stores the commands used to run the Process that resulted in this ProcessResult. This is more convenient for reporting Process outcomes. Since this changed the semantics of ProcessResult.equals(), this class has been renamed to the now-more-suitable ProcessReport. Reviewed by Thomas. Modified Paths: -------------- trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/OutputGobblingProcessRunner.java Added Paths: ----------- trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/ProcessReport.java Removed Paths: ------------- trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/ProcessResult.java Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/OutputGobblingProcessRunner.java =================================================================== --- trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/OutputGobblingProcessRunner.java 2012-01-10 23:51:20 UTC (rev 1300) +++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/OutputGobblingProcessRunner.java 2012-01-20 19:12:00 UTC (rev 1301) @@ -24,7 +24,7 @@ this.charsetName = charsetName; } - public ProcessResult run() throws IOException, InterruptedException { + public ProcessReport run() throws IOException, InterruptedException { // Start the process Process process = processBuilder.start(); @@ -51,7 +51,7 @@ String stdoutMessage = stdoutStream.toString(charsetName).trim(); String stderrMessage = stderrStream.toString(charsetName).trim(); - return new ProcessResult(exitValue, stdoutMessage, stderrMessage); + return ProcessReport.of(processBuilder.command(), exitValue, stdoutMessage, stderrMessage); } @Override Copied: trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/ProcessReport.java (from rev 1300, trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/ProcessResult.java) =================================================================== --- trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/ProcessReport.java (rev 0) +++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/ProcessReport.java 2012-01-20 19:12:00 UTC (rev 1301) @@ -0,0 +1,107 @@ +package org.cishell.utilities.process; + +import java.util.List; + +import com.google.common.base.Joiner; +import com.google.common.base.Objects; +import com.google.common.collect.ImmutableList; + +/** + * Value class for the result of {@link OutputGobblingProcessRunner#run()}. + * Represents a process's commands, exit value, and messages to standard out and standard errors. + */ +public class ProcessReport { + private final ImmutableList<String> commands; + private final int exitValue; + private final String stdoutMessage; + private final String stderrMessage; + + /** + * @param commands Commands used to launch the corresponding {@link Process}. + * @param exitValue A completed {@link Process}'s exit value. + * @param stdoutMessage A completed {@link Process}'s messages to standard output as one String. + * @param stderrMessage A completed {@link Process}'s messages to standard error as one String. + */ + public static ProcessReport of( + List<String> commands, int exitValue, String stdoutMessage, String stderrMessage) { + return new ProcessReport(commands, exitValue, stdoutMessage, stderrMessage); + } + private ProcessReport( + List<String> commands, int exitValue, String stdoutMessage, String stderrMessage) { + this.commands = ImmutableList.copyOf(commands); + this.exitValue = exitValue; + this.stdoutMessage = stdoutMessage; + this.stderrMessage = stderrMessage; + } + + + public ImmutableList<String> getCommands() { + return commands; + } + + public int getExitValue() { + return exitValue; + } + + /** + * @return The message to standard output. + */ + public String getStdoutMessage() { + return stdoutMessage; + } + + /** + * @return The message to standard error. + */ + public String getStderrMessage() { + return stderrMessage; + } + + /** + * @return True if and only if the exit value is zero. + */ + public boolean isExitNormal() { + return (exitValue == 0); + } + + @Override + public boolean equals(Object thatObject) { + if (!(thatObject instanceof ProcessReport)) { + return false; + } + + ProcessReport that = (ProcessReport) thatObject; + + return (Objects.equal(this.commands, + that.commands) + && Objects.equal(this.exitValue, + that.exitValue) + && Objects.equal(this.stdoutMessage, + that.stdoutMessage) + && Objects.equal(this.stderrMessage, + that.stderrMessage)); + } + @Override + public int hashCode() { + return Objects.hashCode(commands, exitValue, stdoutMessage, stderrMessage); + } + + /** + * @return A human-readable report of all values. + */ + @Override + public String toString() { + return Joiner.on(" ").join( + String.format("The commands %s resulted in exit value %d.", commands, exitValue), + reportStreamContents("standard output", stdoutMessage), + reportStreamContents("standard error", stderrMessage)); + } + + private static String reportStreamContents(String streamName, String contents) { + if (contents.isEmpty()) { + return String.format("No messages to %s.", streamName); + } else { + return String.format("Message to %s: [[%s]].", streamName, contents); + } + } +} \ No newline at end of file Deleted: trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/ProcessResult.java =================================================================== --- trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/ProcessResult.java 2012-01-10 23:51:20 UTC (rev 1300) +++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/ProcessResult.java 2012-01-20 19:12:00 UTC (rev 1301) @@ -1,98 +0,0 @@ -package org.cishell.utilities.process; - -import com.google.common.base.Joiner; -import com.google.common.base.Objects; - -/** - * Value class for the result of {@link OutputGobblingProcessRunner#run()}. - * Represents a process's exit value and messages to standard out and standard error, - * both as a single String. - */ -public class ProcessResult { - private int exitValue; - private String stdoutMessage; - private String stderrMessage; - - /** - * @param exitValue A completed {@link Process}'s exit value. - * @param stdoutMessage A completed {@link Process}'s messages to standard output as one String. - * @param stderrMessage A completed {@link Process}'s messages to standard error as one String. - */ - public ProcessResult(int exitValue, String stdoutMessage, String stderrMessage) { - this.exitValue = exitValue; - this.stdoutMessage = stdoutMessage; - this.stderrMessage = stderrMessage; - } - - public int getExitValue() { - return exitValue; - } - - /** - * @return The message to standard output. - */ - public String getStdoutMessage() { - return stdoutMessage; - } - - /** - * @return The message to standard error. - */ - public String getStderrMessage() { - return stderrMessage; - } - - /** - * @return True if and only if the exit value is zero. - */ - public boolean isExitNormal() { - return (exitValue == 0); - } - - /** - * @return A plain-text report of the exit value and standard output/error messages. - */ - public String report() { - return Joiner.on(" ").join( - String.format("The program returned exit value %d.", exitValue), - reportStreamContents("standard output", stdoutMessage), - reportStreamContents("standard error", stderrMessage)); - } - - private static String reportStreamContents(String streamName, String contents) { - if (contents.isEmpty()) { - return String.format("No messages to %s.", streamName); - } else { - return String.format("Message to %s: [[%s]].", streamName, contents); - } - } - - @Override - public boolean equals(Object thatObject) { - if (!(thatObject instanceof ProcessResult)) { - return false; - } - - ProcessResult that = (ProcessResult) thatObject; - - return (Objects.equal(this.exitValue, - that.exitValue) - && Objects.equal(this.stdoutMessage, - that.stdoutMessage) - && Objects.equal(this.stderrMessage, - that.stderrMessage)); - } - @Override - public int hashCode() { - return Objects.hashCode(exitValue, stdoutMessage, stderrMessage); - } - - @Override - public String toString() { - return Objects.toStringHelper(this) - .add("exitValue", exitValue) - .add("stdoutMessage", stdoutMessage) - .add("stderrMessage", stderrMessage) - .toString(); - } -} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jrb...@us...> - 2012-01-10 23:51:26
|
Revision: 1300 http://cishell.svn.sourceforge.net/cishell/?rev=1300&view=rev Author: jrbibers Date: 2012-01-10 23:51:20 +0000 (Tue, 10 Jan 2012) Log Message: ----------- New "process" subpackage for CIShell utilities. Three new classes for working with java.lang.Process. Core functionality is (1) emptying the standard output and standard error streams as a running process fills them since the process would otherwise block indefinitely and (2) capturing the exit value and standard output and standard error messages of the completed process as a ProcessResult. Manifest updated to export this new package. Reviewed by David. Modified Paths: -------------- trunk/core/org.cishell.utilities/META-INF/MANIFEST.MF Added Paths: ----------- trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/ trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/OutputGobblingProcessRunner.java trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/ProcessResult.java trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/StreamGobbler.java Modified: trunk/core/org.cishell.utilities/META-INF/MANIFEST.MF =================================================================== --- trunk/core/org.cishell.utilities/META-INF/MANIFEST.MF 2012-01-09 16:19:32 UTC (rev 1299) +++ trunk/core/org.cishell.utilities/META-INF/MANIFEST.MF 2012-01-10 23:51:20 UTC (rev 1300) @@ -36,4 +36,5 @@ org.cishell.utilities.mutateParameter, org.cishell.utilities.mutateParameter.defaultvalue, org.cishell.utilities.mutateParameter.dropdown, - org.cishell.utilities.osgi.logging + org.cishell.utilities.osgi.logging, + org.cishell.utilities.process Added: trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/OutputGobblingProcessRunner.java =================================================================== --- trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/OutputGobblingProcessRunner.java (rev 0) +++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/OutputGobblingProcessRunner.java 2012-01-10 23:51:20 UTC (rev 1300) @@ -0,0 +1,64 @@ +package org.cishell.utilities.process; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; + +import com.google.common.base.Objects; + +/** + * {@link Process#waitFor()} may wait indefinitely if the running process's stdout and stderr + * streams are not emptied as they fill. + * + * See + * <a href="http://stackoverflow.com/questions/2150723/process-waitfor-threads-and-inputstreams">here</a> + * or + * <a href="http://www.javaworld.com/javaworld/jw-12-2000/jw-1229-traps.html">here</a> for details. + * + */ +public class OutputGobblingProcessRunner { + private ProcessBuilder processBuilder; + private String charsetName; + + public OutputGobblingProcessRunner(ProcessBuilder processBuilder, String charsetName) { + this.processBuilder = processBuilder; + this.charsetName = charsetName; + } + + public ProcessResult run() throws IOException, InterruptedException { + // Start the process + Process process = processBuilder.start(); + + // Set up and start the stdout and stderr gobblers + ByteArrayOutputStream stdoutStream = new ByteArrayOutputStream(); + StreamGobbler stdoutGobbler = new StreamGobbler(process.getInputStream(), stdoutStream); + + ByteArrayOutputStream stderrStream = new ByteArrayOutputStream(); + StreamGobbler stderrGobbler = new StreamGobbler(process.getErrorStream(), stderrStream); + + stdoutGobbler.start(); + stderrGobbler.start(); + + // Wait for the process to finish + int exitValue = process.waitFor(); + + // Interrupt the gobblers and wait for both to die + stdoutGobbler.interrupt(); + stderrGobbler.interrupt(); + stdoutGobbler.join(); + stderrGobbler.join(); + + // Dump gobbler messages + String stdoutMessage = stdoutStream.toString(charsetName).trim(); + String stderrMessage = stderrStream.toString(charsetName).trim(); + + return new ProcessResult(exitValue, stdoutMessage, stderrMessage); + } + + @Override + public String toString() { + return Objects.toStringHelper(this) + .add("processBuilder", processBuilder) + .add("charsetName", charsetName) + .toString(); + } +} Added: trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/ProcessResult.java =================================================================== --- trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/ProcessResult.java (rev 0) +++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/ProcessResult.java 2012-01-10 23:51:20 UTC (rev 1300) @@ -0,0 +1,98 @@ +package org.cishell.utilities.process; + +import com.google.common.base.Joiner; +import com.google.common.base.Objects; + +/** + * Value class for the result of {@link OutputGobblingProcessRunner#run()}. + * Represents a process's exit value and messages to standard out and standard error, + * both as a single String. + */ +public class ProcessResult { + private int exitValue; + private String stdoutMessage; + private String stderrMessage; + + /** + * @param exitValue A completed {@link Process}'s exit value. + * @param stdoutMessage A completed {@link Process}'s messages to standard output as one String. + * @param stderrMessage A completed {@link Process}'s messages to standard error as one String. + */ + public ProcessResult(int exitValue, String stdoutMessage, String stderrMessage) { + this.exitValue = exitValue; + this.stdoutMessage = stdoutMessage; + this.stderrMessage = stderrMessage; + } + + public int getExitValue() { + return exitValue; + } + + /** + * @return The message to standard output. + */ + public String getStdoutMessage() { + return stdoutMessage; + } + + /** + * @return The message to standard error. + */ + public String getStderrMessage() { + return stderrMessage; + } + + /** + * @return True if and only if the exit value is zero. + */ + public boolean isExitNormal() { + return (exitValue == 0); + } + + /** + * @return A plain-text report of the exit value and standard output/error messages. + */ + public String report() { + return Joiner.on(" ").join( + String.format("The program returned exit value %d.", exitValue), + reportStreamContents("standard output", stdoutMessage), + reportStreamContents("standard error", stderrMessage)); + } + + private static String reportStreamContents(String streamName, String contents) { + if (contents.isEmpty()) { + return String.format("No messages to %s.", streamName); + } else { + return String.format("Message to %s: [[%s]].", streamName, contents); + } + } + + @Override + public boolean equals(Object thatObject) { + if (!(thatObject instanceof ProcessResult)) { + return false; + } + + ProcessResult that = (ProcessResult) thatObject; + + return (Objects.equal(this.exitValue, + that.exitValue) + && Objects.equal(this.stdoutMessage, + that.stdoutMessage) + && Objects.equal(this.stderrMessage, + that.stderrMessage)); + } + @Override + public int hashCode() { + return Objects.hashCode(exitValue, stdoutMessage, stderrMessage); + } + + @Override + public String toString() { + return Objects.toStringHelper(this) + .add("exitValue", exitValue) + .add("stdoutMessage", stdoutMessage) + .add("stderrMessage", stderrMessage) + .toString(); + } +} \ No newline at end of file Added: trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/StreamGobbler.java =================================================================== --- trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/StreamGobbler.java (rev 0) +++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/process/StreamGobbler.java 2012-01-10 23:51:20 UTC (rev 1300) @@ -0,0 +1,60 @@ +package org.cishell.utilities.process; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.PrintWriter; + +import com.google.common.base.Objects; + +/** + * Running this thread empties {@link #inputStream} into {@link #outputStream}. + * <p/> + * Adapted from + * <a href="http://www.javaworld.com/javaworld/jw-12-2000/jw-1229-traps.html?page=4">this guide</a>. + */ +public class StreamGobbler extends Thread { + private InputStream inputStream; + private OutputStream outputStream; + + /** + * @param inputStream Stream for reading. + * @param outputStream Stream for writing. + */ + public StreamGobbler(InputStream inputStream, OutputStream outputStream) { + this.inputStream = inputStream; + this.outputStream = outputStream; + } + + /** + * Empties this gobbler's {@link InputStream} into its {@link OutputStream}. + */ + @Override + public void run() { + try { + PrintWriter printWriter = new PrintWriter(outputStream); + + InputStreamReader inputStreamReader = new InputStreamReader(inputStream); + BufferedReader bufferedReader = new BufferedReader(inputStreamReader); + String line = null; + while ((line = bufferedReader.readLine()) != null) { + printWriter.println(line); + } + + printWriter.flush(); + } catch (IOException e) { + e.printStackTrace(); + throw new RuntimeException("Problem reading messages from process.", e); + } + } + + @Override + public String toString() { + return Objects.toStringHelper(this) + .add("inputStream", inputStream) + .add("outputStream", outputStream) + .toString(); + } +} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jrb...@us...> - 2012-01-09 16:19:42
|
Revision: 1299 http://cishell.svn.sourceforge.net/cishell/?rev=1299&view=rev Author: jrbibers Date: 2012-01-09 16:19:32 +0000 (Mon, 09 Jan 2012) Log Message: ----------- Changing Bundle-Version from 0.8.0 to 8.0.0 to agree with the version of the exported packages. The failure of these versions to agree was causing OSGi dependency problems for plugins that import Guava packages in the Linux build of Sci2. Modified Paths: -------------- trunk/libs/google_guava/META-INF/MANIFEST.MF Modified: trunk/libs/google_guava/META-INF/MANIFEST.MF =================================================================== --- trunk/libs/google_guava/META-INF/MANIFEST.MF 2011-12-28 18:00:43 UTC (rev 1298) +++ trunk/libs/google_guava/META-INF/MANIFEST.MF 2012-01-09 16:19:32 UTC (rev 1299) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: google_guava Bundle-SymbolicName: google_guava -Bundle-Version: 0.8.0 +Bundle-Version: 8.0.0 Bundle-ClassPath: guava-r08.jar Export-Package: com.google.common.annotations;version="8.0.0", com.google.common.base;version="8.0.0", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dav...@us...> - 2011-12-28 18:00:50
|
Revision: 1298 http://cishell.svn.sourceforge.net/cishell/?rev=1298&view=rev Author: david-coe Date: 2011-12-28 18:00:43 +0000 (Wed, 28 Dec 2011) Log Message: ----------- Initial import. This is a prototype for using a webservice interface to interact with CIShell services. Added Paths: ----------- trunk/testing/org.cishell.testing.webapp/.classpath trunk/testing/org.cishell.testing.webapp/.project trunk/testing/org.cishell.testing.webapp/.settings/ trunk/testing/org.cishell.testing.webapp/.settings/org.eclipse.jdt.core.prefs trunk/testing/org.cishell.testing.webapp/.settings/org.eclipse.pde.core.prefs trunk/testing/org.cishell.testing.webapp/META-INF/ trunk/testing/org.cishell.testing.webapp/META-INF/MANIFEST.MF trunk/testing/org.cishell.testing.webapp/README.html trunk/testing/org.cishell.testing.webapp/README.txt trunk/testing/org.cishell.testing.webapp/bin/ trunk/testing/org.cishell.testing.webapp/build.properties trunk/testing/org.cishell.testing.webapp/libs/ trunk/testing/org.cishell.testing.webapp/libs/CIShell.war trunk/testing/org.cishell.testing.webapp/libs/bridge.war trunk/testing/org.cishell.testing.webapp/src/ trunk/testing/org.cishell.testing.webapp/src/org/ trunk/testing/org.cishell.testing.webapp/src/org/cishell/ trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/ trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/ trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/Activator.java trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/ConvertServlet.java trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/ListFiles.java trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/ReturnFile.java trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/UploadFile.java trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/utilities/ trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/utilities/WebAppLogger.java Added: trunk/testing/org.cishell.testing.webapp/.classpath =================================================================== --- trunk/testing/org.cishell.testing.webapp/.classpath (rev 0) +++ trunk/testing/org.cishell.testing.webapp/.classpath 2011-12-28 18:00:43 UTC (rev 1298) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: trunk/testing/org.cishell.testing.webapp/.project =================================================================== --- trunk/testing/org.cishell.testing.webapp/.project (rev 0) +++ trunk/testing/org.cishell.testing.webapp/.project 2011-12-28 18:00:43 UTC (rev 1298) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.cishell.testing.webapp</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>net.sf.eclipsecs.core.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + </natures> +</projectDescription> Added: trunk/testing/org.cishell.testing.webapp/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/testing/org.cishell.testing.webapp/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/testing/org.cishell.testing.webapp/.settings/org.eclipse.jdt.core.prefs 2011-12-28 18:00:43 UTC (rev 1298) @@ -0,0 +1,8 @@ +#Fri Dec 16 10:50:57 EST 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 Added: trunk/testing/org.cishell.testing.webapp/.settings/org.eclipse.pde.core.prefs =================================================================== --- trunk/testing/org.cishell.testing.webapp/.settings/org.eclipse.pde.core.prefs (rev 0) +++ trunk/testing/org.cishell.testing.webapp/.settings/org.eclipse.pde.core.prefs 2011-12-28 18:00:43 UTC (rev 1298) @@ -0,0 +1,5 @@ +#Fri Dec 16 10:50:57 EST 2011 +eclipse.preferences.version=1 +pluginProject.equinox=false +pluginProject.extensions=false +resolve.requirebundle=false Added: trunk/testing/org.cishell.testing.webapp/META-INF/MANIFEST.MF =================================================================== --- trunk/testing/org.cishell.testing.webapp/META-INF/MANIFEST.MF (rev 0) +++ trunk/testing/org.cishell.testing.webapp/META-INF/MANIFEST.MF 2011-12-28 18:00:43 UTC (rev 1298) @@ -0,0 +1,22 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: WebBundle +Bundle-SymbolicName: org.cishell.testing.webapp +Bundle-Version: 1.0.0 +Bundle-Activator: org.cishell.testing.webapp.Activator +Import-Package: javax.servlet;version="2.5.0", + javax.servlet.http;version="2.5.0", + org.apache.commons.fileupload;version="1.2.2", + org.apache.commons.fileupload.disk;version="1.2.2", + org.apache.commons.fileupload.servlet;version="1.2.2", + org.cishell.framework;version="1.0.0", + org.cishell.framework.algorithm;version="1.0.0", + org.cishell.framework.data;version="1.0.0", + org.cishell.service.conversion;version="1.0.0", + org.cishell.utilities, + org.osgi.framework;version="1.3.0", + org.osgi.service.http;version="1.2.0", + org.osgi.service.log;version="1.3.0", + org.osgi.util.tracker;version="1.3.3" +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +X-AutoStart: true Added: trunk/testing/org.cishell.testing.webapp/README.html =================================================================== --- trunk/testing/org.cishell.testing.webapp/README.html (rev 0) +++ trunk/testing/org.cishell.testing.webapp/README.html 2011-12-28 18:00:43 UTC (rev 1298) @@ -0,0 +1,23 @@ +To get the demo running on your own machine:<br> +<ul> + <li>Basic Test Setup<br></li> + <ul><li>Get the war file called bridge.war from <a href="http://www.eclipse.org/equinox/server/http_in_container.php" target="_blank">here</a>.</li> + <li>Extract it into webapps in Tomcat or whatever you choose to use<br></li> + <li>Test it by visiting <a href="http://localhost/bridge/sp_test" target="_blank">http://localhost/bridge/sp_<wbr>test</a></li></ul><li>Real Setup</li> + <ul><li>Use the cishell.war file found in the libs and launch your servlet container (e.g. Tomcat)</li> + <li> Export the org.cishell.testing.webapp as a "deployable plugin or fragment" to the /cishell/WEB-INF/eclipse/plugins folder</li><li>Change the config.ini file in /CIShell/WEB-INF/eclipse/<wbr>configuration/ to include:</li> + <ul><li>osgi.bundles=org.eclipse.<wbr>equinox.common@2:start, + org.eclipse.update.<wbr>configurator@start, + org.eclipse.equinox.http.<wbr>servletbridge@start, + org.eclipse.equinox.http.<wbr>registry@start, org.cishell.testing.webapp@start, + edu.iu.nwb.converter.nwb@start<wbr>, org.eclipse.equinox.ds@start, + org.eclipse.osgi.services@<wbr>start, org.eclipse.equinox.metatype@<wbr>start, + org.eclipse.equinox.log@start, org.cishell.reference.<wbr>services@start, + edu.iu.nwb.converter.<wbr>nwbgraphml@start</li></ul> + <li>Edit /CIShell/WEB-INF/web.xml to remove the console if you desire.</li> + <li>To apply the changes:</li> + <ul> + <li>visit <a href="http://localhost/CIShell/sp_stop" target="_blank">http://localhost/CIShell/sp_<wbr>stop</a>, then <a href="http://localhost/CIShell/sp_undeploy" target="_blank">http://localhost/CIShell/sp_<wbr>undeploy</a> to stop and remove the old stuff</li> + <li>visit <a href="http://localhost/CIShell/sp_deploy" target="_blank">http://localhost/CIShell/sp_<wbr>deploy</a>, then <a href="http://localhost/CIShell/sp_start" target="_blank">http://localhost/CIShell/sp_<wbr>start</a> to copy from the new eclipse and start again.</li> + </ul> + <li>visit <a href="http://localhost/CIShell/upload" target="_blank">http://localhost/CIShell/upload</a> to verify everything works.</li> \ No newline at end of file Added: trunk/testing/org.cishell.testing.webapp/README.txt =================================================================== --- trunk/testing/org.cishell.testing.webapp/README.txt (rev 0) +++ trunk/testing/org.cishell.testing.webapp/README.txt 2011-12-28 18:00:43 UTC (rev 1298) @@ -0,0 +1,16 @@ +To get the demo running on your own machine: + + Basic Test Setup + Get the war file called bridge.war from http://www.eclipse.org/equinox/server/http_in_container.php. + Extract it into webapps in Tomcat or whatever you choose to use + Test it by visiting http://localhost/bridge/sp_test + Real Setup + Use the cishell.war file found in the libs and launch your servlet container (e.g. Tomcat) + Export the org.cishell.testing.webapp as a "deployable plugin or fragment" to the /CIShell/WEB-INF/eclipse/plugins folder + Change the config.ini file in /CIShell/WEB-INF/eclipse/configuration/ to include: + osgi.bundles=org.eclipse.equinox.common@2:start, org.eclipse.update.configurator@start, org.eclipse.equinox.http.servletbridge@start, org.eclipse.equinox.http.registry@start, org.cishell.testing.webapp@start, edu.iu.nwb.converter.nwb@start, org.eclipse.equinox.ds@start, org.eclipse.osgi.services@start, org.eclipse.equinox.metatype@start, org.eclipse.equinox.log@start, org.cishell.reference.services@start, edu.iu.nwb.converter.nwbgraphml@start + Edit /CIShell/WEB-INF/web.xml to remove the console if you desire. + To apply the changes: + visit http://localhost/CIShell/sp_stop, then http://localhost/CIShell/sp_undeploy to stop and remove the old stuff + visit http://localhost/CIShell/sp_deploy, then http://localhost/CIShell/sp_start to copy from the new eclipse and start again. + visit http://localhost/CIShell/upload to verify everything works. \ No newline at end of file Added: trunk/testing/org.cishell.testing.webapp/build.properties =================================================================== --- trunk/testing/org.cishell.testing.webapp/build.properties (rev 0) +++ trunk/testing/org.cishell.testing.webapp/build.properties 2011-12-28 18:00:43 UTC (rev 1298) @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . Added: trunk/testing/org.cishell.testing.webapp/libs/CIShell.war =================================================================== (Binary files differ) Property changes on: trunk/testing/org.cishell.testing.webapp/libs/CIShell.war ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/testing/org.cishell.testing.webapp/libs/bridge.war =================================================================== (Binary files differ) Property changes on: trunk/testing/org.cishell.testing.webapp/libs/bridge.war ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/Activator.java =================================================================== --- trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/Activator.java (rev 0) +++ trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/Activator.java 2011-12-28 18:00:43 UTC (rev 1298) @@ -0,0 +1,83 @@ +package org.cishell.testing.webapp; + +import org.cishell.testing.webapp.utilities.WebAppLogger; +import org.cishell.utilities.FileUtilities; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; +import org.osgi.service.http.HttpService; +import org.osgi.service.log.LogService; +import org.osgi.util.tracker.ServiceTracker; + +/** + * This bundle activates several servlets that then are bound to html links on + * the server. The can be accessed in the general form [host]/CIShell/... + * + * @author dmcoe + * + */ +public class Activator implements BundleActivator { + public static final String WEBAPP_ROOT_URL = "/CIShell"; + public static final String FILE_DIRECTORY = FileUtilities.getDefaultTemporaryDirectory(); + + private HttpServiceTracker httpServiceTracker; + + public void start(BundleContext bundleContext) throws Exception { + + httpServiceTracker = new HttpServiceTracker(bundleContext); + httpServiceTracker.open(); + + WebAppLogger logger = WebAppLogger.getInstance(bundleContext); + logger.writeToLog("Webservice interface has been started.", + LogService.LOG_INFO); + + } + + public void stop(BundleContext bundleContext) throws Exception { + + httpServiceTracker.close(); + httpServiceTracker = null; + } + + public class HttpServiceTracker extends ServiceTracker<HttpService, HttpService> { + + public HttpServiceTracker(BundleContext context) { + super(context, HttpService.class.getName(), null); + } + + public HttpService addingService(ServiceReference<HttpService> reference) { + HttpService httpService = super.addingService(reference); + if (httpService == null) { + return null; + } + + try { + httpService.registerServlet(ConvertServlet.CONVERT_FILE_URL, + new ConvertServlet(context), null, null); + httpService.registerServlet(UploadFile.UPLOAD_FILE_URL, + new UploadFile(context), null, null); + httpService.registerServlet(ListFiles.LIST_FILES_URL, + new ListFiles(), null, null); + httpService.registerServlet(ReturnFile.RETURN_FILE_URL, + new ReturnFile(), null, null); + + } catch (Exception e) { + e.printStackTrace(); + } + + return httpService; + } + + public void removedService(ServiceReference<HttpService> reference, + HttpService service) { + HttpService httpService = service; + httpService.unregister(ConvertServlet.CONVERT_FILE_URL); + httpService.unregister(UploadFile.UPLOAD_FILE_URL); + httpService.unregister(ListFiles.LIST_FILES_URL); + httpService.unregister(ReturnFile.RETURN_FILE_URL); + super.removedService(reference, service); + } + + } + +} Added: trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/ConvertServlet.java =================================================================== --- trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/ConvertServlet.java (rev 0) +++ trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/ConvertServlet.java 2011-12-28 18:00:43 UTC (rev 1298) @@ -0,0 +1,324 @@ +package org.cishell.testing.webapp; + +import java.io.File; +import java.io.IOException; +import java.io.Writer; +import java.text.ParseException; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.cishell.framework.algorithm.Algorithm; +import org.cishell.framework.algorithm.AlgorithmExecutionException; +import org.cishell.framework.algorithm.AlgorithmFactory; +import org.cishell.framework.data.BasicData; +import org.cishell.framework.data.Data; +import org.cishell.service.conversion.ConversionException; +import org.cishell.service.conversion.DataConversionService; +import org.cishell.testing.webapp.utilities.WebAppLogger; +import org.cishell.utilities.AlgorithmNotFoundException; +import org.cishell.utilities.AlgorithmUtilities; +import org.cishell.utilities.FileCopyingException; +import org.cishell.utilities.FileUtilities; +import org.osgi.framework.BundleContext; +import org.osgi.service.log.LogService; +import org.osgi.util.tracker.ServiceTracker; + +/** + * A servlet for converting files uploaded to the server to a different type. + * Currently it is hard coded to convert to GraphML. The path for accessing + * should be something like [host]/cishell/convert?filename=FILENAME.nwb + * + * @author dmcoe + * + */ +public class ConvertServlet extends HttpServlet { + private BundleContext context; + + public static final String RETURN_FILE_DIRECTORY = Activator.FILE_DIRECTORY; + public static final String CONVERT_FILE_URL = "/convert"; + public static final String CONVERT_FILE_URL_GET_PARAMETER = "filename"; + private File fileDir; + + private static final long serialVersionUID = 1L; + + /** + * Construct a ConvertServlet. + * + * @param context + * The bundlecontext for the servelet. + */ + public ConvertServlet(BundleContext context) { + this.context = context; + } + + /** + * This will build a paragraph element with a link in HTML that links to the + * conversion service for the given filename. + * + * @param filename + * The file's name that will be converted. + * @return An html + * <p> + * with a link to the conversion service. + */ + public static String conversionParagraphLink(String filename) { + String html = "<p><a href=\"" + Activator.WEBAPP_ROOT_URL + + CONVERT_FILE_URL + "?" + CONVERT_FILE_URL_GET_PARAMETER + "=" + + filename + "\">Convert this to GraphML</a></p>"; + return html; + } + + public void init(ServletConfig config) throws ServletException { + + fileDir = new File(RETURN_FILE_DIRECTORY); + if (!fileDir.isDirectory()) { + throw new ServletException(RETURN_FILE_DIRECTORY + + " is not a directory"); + } + + } + + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + WebAppLogger logger = WebAppLogger.getInstance(context); + + resp.setContentType("text/html"); + Writer out = resp.getWriter(); + out.write("<html><head></head><body>"); + String errors = ""; + String outHTML = ""; + String filename = req.getParameter("filename"); + File file = openFile(filename); + if (file.exists()) { + try { + Data[] data = validateFile(file); + Data datum = data[0]; + outHTML += "<p>Your file is of type " + datum.getFormat() + + ".</p>"; + + // TODO get this information from the user + String fileFormat = "file:text/graphml+xml"; + + try { + Data convertedData = convertData(datum, fileFormat); + if (convertedData != null) { + outHTML += "<p>Your data was successfully converted to " + + convertedData.getFormat() + "</p>"; + File savedConvertedFile = saveData(convertedData); + if (savedConvertedFile != null) { + outHTML += "<p>Your converted data was saved.</p>"; + + outHTML += "<p>" + + ReturnFile + .returnFileLink(savedConvertedFile + .getName()) + "</p>"; + } + } else { + errors += "<p>The Conversion Service is not running. " + + "Your file could not be converted.</p>"; + } + } catch (ConversionException e) { + logger.writeToLog( + "The conversion failed: " + e.getMessage(), + LogService.LOG_ERROR); + errors += "<p>Conversion to " + fileFormat + + " failed because " + e.getMessage() + "</p>"; + } + + } catch (AlgorithmExecutionException e) { + logger.writeToLog("Your file was not of a valid type", + LogService.LOG_ERROR); + errors += "<p>Your file was not of a valid type.</p>"; + } + } else { + logger.writeToLog("The file \"" + file.getAbsolutePath() + + "\" does not exist", LogService.LOG_ERROR); + errors += "<p>Your file could not be located.</p>"; + } + + if (errors == "") { + out.write(outHTML); + } else { + out.write(errors); + } + out.write("</body></html>"); + } + + /** + * Write the data out to a file. + * + * @param data + * The data to be written to disk. + * @return The file object of the written data. + * @throws IOException + */ + private File saveData(Data data) throws IOException { + File dataFile = (File) data.getData(); + + File targetFile = new File(RETURN_FILE_DIRECTORY, dataFile.getName()); + + try { + FileUtilities.copyFile(dataFile, targetFile); + } catch (FileCopyingException e) { + throw new IOException(e.getMessage()); + } + + return targetFile; + } + + /** + * Convert the data from one format to another. + * + * @param data + * The data you would like converted + * @param fileFormat + * The string file format of the target data + * @return The converted data or null if no conversion service was running. + * @throws ConversionException + */ + private Data convertData(Data data, String fileFormat) + throws ConversionException { + + if (data.getFormat() == fileFormat) { + return data; + } + + WebAppLogger logger = WebAppLogger.getInstance(context); + + ServiceTracker<DataConversionService, DataConversionService> conversionServiceTracker = + new ServiceTracker<DataConversionService, DataConversionService>( + context, DataConversionService.class.getName(), null); + + conversionServiceTracker.open(); + + DataConversionService conversionService = conversionServiceTracker + .getService(); + + if (conversionService == null) { + logger.writeToLog("The Conversion Service is not running.", + LogService.LOG_ERROR); + throw new ConversionException( + "The Conversion Service is not running."); + } + + Data convertedData = conversionService.convert(data, fileFormat); + + /** + * FIXME this can be removed when the conversion service's convert bug + * is fixed. There is an issue where if a converter cannot be found, the + * input data will be returned. This is no acceptable. + */ + if (convertedData.getFormat() == data.getFormat()) { + logger.writeToLog("No conversion chain was found to sastisfy converting from " + + data.getFormat() + " to " + fileFormat, + LogService.LOG_ERROR); + throw new ConversionException( + "No conversion chain was found to sastisfy converting from " + + data.getFormat() + " to " + fileFormat); + } + + conversionServiceTracker.close(); + return convertedData; + } + + /** + * This will return a query string that will return validators that can + * validate the file extension. + * + * @param fileExtension + * The file extension of the file you wish to be validated. + * @return A query that will find validators. + */ + private String buildValidatorQuery(String fileExtension) { + String validatorsQuery = "(& (type=validator)" + "(|" + + "(in_data=file-ext:" + fileExtension + ")" + + "(also_validates=" + fileExtension + ")" + "))"; + return validatorsQuery; + } + + /** + * Using a file object, this looks for a validator based on the file + * extension. + * + * @param file + * The file to be validated. + * @return A data[] representing the data the file contained. + * @throws AlgorithmExecutionException + */ + private Data[] validateFile(File file) throws AlgorithmExecutionException { + WebAppLogger logger = WebAppLogger.getInstance(context); + + // A dummy data[] must be setup for the validator to work. + Data[] validationData = new Data[] { new BasicData(file.getPath(), + String.class.getName()) }; + + try { + String fileExtension = getFileExtension(file.getPath()); + + String validatorsQuery = buildValidatorQuery(fileExtension); + + try { + // Get the validator based on the file extension + AlgorithmFactory validatorFactory = AlgorithmUtilities + .getAlgorithmFactoryByFilter(validatorsQuery, context); + + Algorithm validator = validatorFactory.createAlgorithm( + validationData, null, null); + + Data[] validatedData = validator.execute(); + logger.writeToLog("Loaded: " + file.getPath(), + LogService.LOG_INFO); + return validatedData; + } catch (AlgorithmExecutionException e) { + logger.writeToLog( + "Your data could not be validated: " + e.getMessage(), + LogService.LOG_ERROR); + throw e; + } catch (AlgorithmNotFoundException e) { + logger.writeToLog(e.getMessage(), LogService.LOG_ERROR); + throw new AlgorithmExecutionException(e.getMessage()); + } + } catch (ParseException e) { + logger.writeToLog(e.getMessage(), LogService.LOG_ERROR); + throw new AlgorithmExecutionException(e.getMessage()); + } + + } + + public File openFile(String filename) { + File file = new File(fileDir.getPath() + File.separator + filename); + + return file; + } + + public void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + + doGet(request, response); + } + + /** + * Get the file extension from the file represented as filePath. + * + * e.g. C:/temp/thisIsAFile.xml -> xml + * + * @param filePath + * The file path. + * @return The extension of the file. + * @throws ParseException + */ + private static String getFileExtension(String filePath) throws ParseException { + int periodPosition = filePath.lastIndexOf("."); + int extensionStart = periodPosition + 1; + if ((periodPosition != -1) && ((extensionStart) < filePath.length())) { + return filePath.substring(extensionStart); + } else { + + throw new ParseException("There is no file extension for " + filePath, periodPosition); + } + } +} Added: trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/ListFiles.java =================================================================== --- trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/ListFiles.java (rev 0) +++ trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/ListFiles.java 2011-12-28 18:00:43 UTC (rev 1298) @@ -0,0 +1,53 @@ +package org.cishell.testing.webapp; + +import java.io.File; +import java.io.IOException; +import java.io.Writer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * A servlet for listing all the files in the directory. Clicking on them will + * allow the files to be downloaded. The path for accessing should be something + * like [host]/cishell/files + * + * @author dmcoe + * + */ +public class ListFiles extends HttpServlet { + + private static final String DIRECTORY_PATH = Activator.FILE_DIRECTORY; + public static final String LIST_FILES_URL = "/files"; + private File destinationDirectory; + + private static final long serialVersionUID = 1L; + + public void init(ServletConfig config) throws ServletException { + super.init(config); + + destinationDirectory = new File(DIRECTORY_PATH); + if (!destinationDirectory.isDirectory()) { + throw new ServletException(DIRECTORY_PATH + " is not a directory"); + } + } + + public void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + response.setContentType("text/html"); + Writer outHtml = response.getWriter(); + outHtml.write("<html><body><h1>Files</h1>"); + + // Write out the html for downloading all the files found + for (String filename : destinationDirectory.list()) { + outHtml.write("<p>" + ReturnFile.returnFileLink(filename) + "</p>"); + } + + outHtml.write("</body></html>"); + + } + +} Added: trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/ReturnFile.java =================================================================== --- trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/ReturnFile.java (rev 0) +++ trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/ReturnFile.java 2011-12-28 18:00:43 UTC (rev 1298) @@ -0,0 +1,112 @@ +package org.cishell.testing.webapp; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.Writer; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * A servlet for downloading files from the server. The path for accessing + * should be something like [host]/cishell/download_file?filename=FILENAME + * + * @author dmcoe + * + */ +public class ReturnFile extends HttpServlet { + + private static final long serialVersionUID = 1L; + public static final String RETURN_FILE_URL = "/download_file"; + private static final String RETURN_FILE_URL_GET_PARAMETER = "filename"; + private static final String DIRECTORY_PATH = Activator.FILE_DIRECTORY; + + private File directory; + + public void init(ServletConfig config) throws ServletException { + super.init(config); + + // This would be cool, save it at {server root}/DIR_PATH + // TODO Use once tomcat is working + // String realPath = getServletContext().getRealPath(DIR_PATH); + + directory = new File(DIRECTORY_PATH); + if (!directory.isDirectory()) { + throw new ServletException(DIRECTORY_PATH + " is not a directory"); + } + } + + public void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + + String filename = request.getParameter(RETURN_FILE_URL_GET_PARAMETER); + + File file = new File(directory.getPath() + File.separatorChar + + filename); + + if (file.exists() && !file.isDirectory()) { + PrintWriter out = null; + BufferedInputStream buf = null; + + response.setContentLength((int) file.length()); + response.setHeader("Content-Disposition", "attachment; filename=\"" + + filename + "\""); + + try { + out = response.getWriter(); + + // Read the file in and output it + buf = new BufferedInputStream(new FileInputStream(file)); + int readBytes = 0; + while ((readBytes = buf.read()) != -1) { + out.write(readBytes); + } + } catch (IOException e) { + throw new ServletException(e.getMessage()); + } finally { + if (out != null) { + out.close(); + } + if (buf != null) { + buf.close(); + } + } + } else { + response.setContentType("text/html"); + Writer outHtml = response.getWriter(); + outHtml.write("<html><body>"); + outHtml.write("<p>There is no such file as " + filename); + outHtml.write("</body></html>"); + } + + } + + public void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + + doGet(request, response); + } + + /** + * An html link that would download the given filename. + * + * @param filename + * The filename of the file to be downloaded + * + * @return Return an html link in string form + */ + public static String returnFileLink(String filename) { + String html = "<a href=\"" + Activator.WEBAPP_ROOT_URL + + RETURN_FILE_URL + "?" + RETURN_FILE_URL_GET_PARAMETER + "=" + + filename + "\">" + filename + "</a>"; + return html; + } + + +} Added: trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/UploadFile.java =================================================================== --- trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/UploadFile.java (rev 0) +++ trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/UploadFile.java 2011-12-28 18:00:43 UTC (rev 1298) @@ -0,0 +1,156 @@ +package org.cishell.testing.webapp; + +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.Writer; +import java.util.Iterator; +import java.util.List; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.FileUploadException; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; +import org.apache.commons.fileupload.servlet.ServletFileUpload; +import org.cishell.testing.webapp.utilities.WebAppLogger; +import org.osgi.framework.BundleContext; +import org.osgi.service.log.LogService; + +/** + * A servlet that allows files to be uploaded to the server. The path for + * accessing should be something like [host]/cishell/upload + * + * @author dmcoe + * + */ +public class UploadFile extends HttpServlet { + public static final int MAX_SIZE_UNTIL_DISK = 1 * 1024 * 1024; // 1MB + private BundleContext context; + + private static final String FINAL_DIRECTORY_PATH = Activator.FILE_DIRECTORY; + private static final String TEMP_DIRECTORY_PATH = FINAL_DIRECTORY_PATH + + File.separator + "tmp"; + public static final String UPLOAD_FILE_URL = "/upload"; + private File tempDir; + private File destinationDir; + + private static final long serialVersionUID = 1L; + + public UploadFile(BundleContext context) { + this.context = context; + } + + public void init(ServletConfig config) throws ServletException { + super.init(config); + + tempDir = new File(TEMP_DIRECTORY_PATH); + + if (tempDir.exists() && !tempDir.isDirectory()) { + throw new ServletException(TEMP_DIRECTORY_PATH + + " is not a directory"); + } else if (!tempDir.exists()) { + tempDir.mkdir(); + } + + // This would be cool, save it at {server root}/DESTINATION_DIR_PATH + // String realPath = + // getServletContext().getRealPath(DESTINATION_DIR_PATH); + + destinationDir = new File(FINAL_DIRECTORY_PATH); + if (!destinationDir.isDirectory()) { + throw new ServletException(FINAL_DIRECTORY_PATH + + " is not a directory"); + } + + } + + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + resp.setContentType("text/html"); + Writer outHTML = resp.getWriter(); + + // Create the upload form + outHTML.write("<html><head></head> <body>" + + "<p>Commons File Upload Example</p>" + + "<form action=\"\" enctype=\"multipart/form-data\" method=\"POST\">" + + "<select name=\"converter\"> <option value=\"nwb\">anytoall</option></select>" + + "<input type=\"file\" name=\"file1\"><br>" + + "<input type=\"Submit\" value=\"Upload File\"><br>" + + "</form>" + "</body></html>"); + outHTML.close(); + + } + + protected void doPost(HttpServletRequest request, + HttpServletResponse response) throws ServletException, IOException { + WebAppLogger logger = WebAppLogger.getInstance(context); + + response.setContentType("text/html"); + PrintWriter outHTML = response.getWriter(); + outHTML.println("<h1>Your Data</h1>"); + + DiskFileItemFactory fileItemFactory = new DiskFileItemFactory(); + /* + * Set the size threshold, above which content will be stored on disk. + */ + fileItemFactory.setSizeThreshold(MAX_SIZE_UNTIL_DISK); + /* + * Set the temporary directory to store the uploaded files of size above + * threshold. + */ + fileItemFactory.setRepository(tempDir); + ServletFileUpload uploadHandler = new ServletFileUpload(fileItemFactory); + try { + /* + * Parse the request + */ + List<?> items = uploadHandler.parseRequest(request); + Iterator<?> iterator = items.iterator(); + while (iterator.hasNext()) { + FileItem item = (FileItem) iterator.next(); + /* + * Handle Form Fields. + */ + if (item.isFormField()) { + outHTML.println("File Name = " + item.getFieldName() + + ", Value = " + item.getString()); + } else { + // Handle Uploaded files. + outHTML.println("Field Name = " + item.getFieldName() + + ", File Name = " + item.getName() + + ", Content type = " + item.getContentType() + + ", File Size = " + item.getSize()); + /* + * Write file to the ultimate location. + */ + File file = new File(destinationDir, item.getName()); + item.write(file); + + outHTML.println("<p>" + + ReturnFile.returnFileLink(file.getName()) + + "</p>"); + + outHTML.println(ConvertServlet.conversionParagraphLink(file + .getName())); + } + } + + } catch (FileUploadException ex) { + logger.writeToLog("Error encountered while parsing the request", + LogService.LOG_ERROR); + log("Error encountered while parsing the request", ex); + } catch (Exception ex) { + logger.writeToLog( + "Error encountered while uploading file: " + + ex.getMessage(), LogService.LOG_ERROR); + log("Error encountered while uploading file", ex); + } + + outHTML.close(); + } +} \ No newline at end of file Added: trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/utilities/WebAppLogger.java =================================================================== --- trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/utilities/WebAppLogger.java (rev 0) +++ trunk/testing/org.cishell.testing.webapp/src/org/cishell/testing/webapp/utilities/WebAppLogger.java 2011-12-28 18:00:43 UTC (rev 1298) @@ -0,0 +1,53 @@ +package org.cishell.testing.webapp.utilities; + +import org.osgi.framework.BundleContext; +import org.osgi.service.log.LogService; +import org.osgi.util.tracker.ServiceTracker; + +public final class WebAppLogger { + private static WebAppLogger instance; + private ServiceTracker<LogService, LogService> logServiceTracker; + + private WebAppLogger(BundleContext context) { + logServiceTracker = new ServiceTracker<LogService, LogService>( + context, LogService.class.getName(), null); + logServiceTracker.open(); + } + + public static WebAppLogger getInstance(BundleContext context) { + if (instance == null) { + instance = new WebAppLogger(context); + } + + return instance; + } + + protected void finalize() throws Throwable { + super.finalize(); + logServiceTracker.close(); + logServiceTracker = null; + } + + /** + * Write the message out to the log at the specified level. It will either + * use the log service if it is found or system out for debugging. + * + * @param message + * Human readable string describing the condition or null. + * @param logLevel + * The severity of the message. This should be one of the defined + * log levels but may be any integer that is interpreted in a + * user defined way. + */ + public void writeToLog(String message, int logLevel) { + LogService log = logServiceTracker.getService(); + if (log != null) { + log.log(logLevel, message); + } else { + System.out + .println("Error: No log service running.\n\tLog message: [" + + logLevel + "] " + message); + } + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dav...@us...> - 2011-12-28 17:57:49
|
Revision: 1297 http://cishell.svn.sourceforge.net/cishell/?rev=1297&view=rev Author: david-coe Date: 2011-12-28 17:57:43 +0000 (Wed, 28 Dec 2011) Log Message: ----------- Initial import. This is a prototype for using a webservice interface to interact with CIShell services. Added Paths: ----------- trunk/testing/org.cishell.testing.webapp/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2011-12-20 22:45:57
|
Revision: 1296 http://cishell.svn.sourceforge.net/cishell/?rev=1296&view=rev Author: rescdsk Date: 2011-12-20 22:45:48 +0000 (Tue, 20 Dec 2011) Log Message: ----------- Undo Maven stuff that should have been on a branch Modified Paths: -------------- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/.classpath trunk/clients/gui/org.cishell.reference.gui.brand.cishell/.project trunk/core/org.cishell.framework/.classpath trunk/core/org.cishell.framework/.project trunk/core/org.cishell.framework/.settings/org.eclipse.jdt.core.prefs trunk/core/org.cishell.reference/.classpath trunk/core/org.cishell.reference/.project trunk/core/org.cishell.reference/.settings/org.eclipse.jdt.core.prefs trunk/deployment/org.cishell.environment.equinox.feature/.project trunk/deployment/org.cishell.feature/.project trunk/deployment/org.cishell.feature/feature.xml trunk/deployment/org.cishell.reference.releng/.project trunk/deployment/org.cishell.reference.releng/cishell.product Added Paths: ----------- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/extra-files/ Removed Paths: ------------- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/.settings/ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/pom.xml trunk/core/org.cishell.framework/.settings/org.eclipse.core.resources.prefs trunk/core/org.cishell.framework/.settings/org.eclipse.m2e.core.prefs trunk/core/org.cishell.framework/pom.xml trunk/core/org.cishell.reference/.settings/org.eclipse.m2e.core.prefs trunk/core/org.cishell.reference/pom.xml trunk/deployment/org.cishell.environment.equinox.feature/.settings/ trunk/deployment/org.cishell.environment.equinox.feature/pom.xml trunk/deployment/org.cishell.feature/.settings/ trunk/deployment/org.cishell.feature/pom.xml trunk/deployment/org.cishell.reference.releng/.settings/ trunk/deployment/org.cishell.reference.releng/pom.xml trunk/deployment/org.cishell.reference.releng/workspace/ Property Changed: ---------------- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileLoadAlgorithm.java trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/core/ViewDataChooser.java trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/common/ trunk/core/org.cishell.framework/src/org/cishell/service/algorithminvocation/FakeAlgorithmInvocationService.java trunk/core/org.cishell.reference/src/org/cishell/reference/app/service/algorithminvocation/FakeAlgorithmInvocationServiceImpl.java trunk/core/org.cishell.reference/src/org/cishell/reference/app/service/persistence/AbstractDialog.java trunk/core/org.cishell.reference.service.database/src/org/cishell/reference/service/database/DerbyDatabaseService.java trunk/core/org.cishell.reference.service.database/src/org/cishell/reference/service/database/ExternalDatabase.java trunk/core/org.cishell.utility.datastructure/src/org/cishell/utility/datastructure/ trunk/core/org.cishell.utility.datastructure/src/org/cishell/utility/datastructure/ObjectContainer.java trunk/core/org.cishell.utility.datastructure/src/org/cishell/utility/datastructure/datamodel/ModelDataSynchronizer.java trunk/core/org.cishell.utility.datastructure/src/org/cishell/utility/datastructure/datamodel/field/validation/FieldValidationAction.java trunk/core/org.cishell.utility.datastructure/src/org/cishell/utility/datastructure/datamodel/field/validation/FieldValidationRule.java trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/ExpandableComponentWidget.java trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/FileSaveAs.java trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/GUIBuilderUtilities.java trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/GUICanceledException.java trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/GridContainer.java trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/SWTUtilities.java trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/ScrolledComponentFactory.java trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/URLClickedListener.java trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/URLMouseCursorListener.java trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/model/ModelFieldException.java trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/model/SWTModel.java trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/model/SWTModelField.java trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/model/datasynchronizer/ trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/model/datasynchronizer/CheckBoxDataSynchronizer.java trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/model/datasynchronizer/DateDataSynchronizer.java trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/model/datasynchronizer/DropDownDataSynchronizer.java trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/model/datasynchronizer/SingleListSelectionDataSynchronizer.java trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/model/datasynchronizer/TextDataSynchronizer.java trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/model/datasynchronizer/TimeDataSynchronizer.java trunk/deployment/org.cishell.reference.releng/ trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/staticexecutable/optiontypes/PlatformOption.java Modified: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/.classpath =================================================================== --- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/.classpath 2011-12-20 18:49:16 UTC (rev 1295) +++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/.classpath 2011-12-20 22:45:48 UTC (rev 1296) @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="output" path="bin"/> +</classpath> Modified: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/.project =================================================================== --- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/.project 2011-12-20 18:49:16 UTC (rev 1295) +++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/.project 2011-12-20 22:45:48 UTC (rev 1296) @@ -1,40 +1,34 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.cishell.reference.gui.brand.cishell</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>net.sourceforge.metrics.builder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>net.sourceforge.metrics.nature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.cishell.reference.gui.brand.cishell</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>net.sourceforge.metrics.builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sourceforge.metrics.nature</nature> + </natures> +</projectDescription> Deleted: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/pom.xml =================================================================== --- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/pom.xml 2011-12-20 18:49:16 UTC (rev 1295) +++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/pom.xml 2011-12-20 22:45:48 UTC (rev 1296) @@ -1,18 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <artifactId>org.cishell.reference.gui.brand.cishell</artifactId> - <packaging>eclipse-plugin</packaging> - <version>0.4.0</version> - <parent> - <groupId>org.cishell</groupId> - <artifactId>plugin-parent</artifactId> - <version>0.0.1</version> - <relativePath>../plugin-parent/pom.xml</relativePath> - </parent> - - <build> - <sourceDirectory>src</sourceDirectory> - </build> - -</project> \ No newline at end of file Property changes on: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileLoadAlgorithm.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/core/ViewDataChooser.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/common ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/core/org.cishell.framework/.classpath =================================================================== --- trunk/core/org.cishell.framework/.classpath 2011-12-20 18:49:16 UTC (rev 1295) +++ trunk/core/org.cishell.framework/.classpath 2011-12-20 22:45:48 UTC (rev 1296) @@ -2,6 +2,6 @@ <classpath> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> </classpath> Modified: trunk/core/org.cishell.framework/.project =================================================================== --- trunk/core/org.cishell.framework/.project 2011-12-20 18:49:16 UTC (rev 1295) +++ trunk/core/org.cishell.framework/.project 2011-12-20 22:45:48 UTC (rev 1296) @@ -1,34 +1,28 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.cishell.framework</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.cishell.framework</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Deleted: trunk/core/org.cishell.framework/.settings/org.eclipse.core.resources.prefs =================================================================== --- trunk/core/org.cishell.framework/.settings/org.eclipse.core.resources.prefs 2011-12-20 18:49:16 UTC (rev 1295) +++ trunk/core/org.cishell.framework/.settings/org.eclipse.core.resources.prefs 2011-12-20 22:45:48 UTC (rev 1296) @@ -1,3 +0,0 @@ -#Thu Dec 15 14:05:43 EST 2011 -eclipse.preferences.version=1 -encoding/src=UTF-8 Modified: trunk/core/org.cishell.framework/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/core/org.cishell.framework/.settings/org.eclipse.jdt.core.prefs 2011-12-20 18:49:16 UTC (rev 1295) +++ trunk/core/org.cishell.framework/.settings/org.eclipse.jdt.core.prefs 2011-12-20 22:45:48 UTC (rev 1296) @@ -1,4 +1,4 @@ -#Fri Dec 09 14:04:21 EST 2011 +#Fri Jun 11 22:41:08 EDT 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 @@ -9,5 +9,4 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.source=1.5 Deleted: trunk/core/org.cishell.framework/.settings/org.eclipse.m2e.core.prefs =================================================================== --- trunk/core/org.cishell.framework/.settings/org.eclipse.m2e.core.prefs 2011-12-20 18:49:16 UTC (rev 1295) +++ trunk/core/org.cishell.framework/.settings/org.eclipse.m2e.core.prefs 2011-12-20 22:45:48 UTC (rev 1296) @@ -1,5 +0,0 @@ -#Fri Dec 09 13:55:42 EST 2011 -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 Deleted: trunk/core/org.cishell.framework/pom.xml =================================================================== --- trunk/core/org.cishell.framework/pom.xml 2011-12-20 18:49:16 UTC (rev 1295) +++ trunk/core/org.cishell.framework/pom.xml 2011-12-20 22:45:48 UTC (rev 1296) @@ -1,18 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <artifactId>org.cishell.framework</artifactId> - <packaging>eclipse-plugin</packaging> - <version>1.0.0</version> - <parent> - <groupId>org.cishell</groupId> - <artifactId>plugin-parent</artifactId> - <version>0.0.1</version> - <relativePath>../plugin-parent/pom.xml</relativePath> - </parent> - - <build> - <sourceDirectory>src</sourceDirectory> - </build> - -</project> \ No newline at end of file Property changes on: trunk/core/org.cishell.framework/src/org/cishell/service/algorithminvocation/FakeAlgorithmInvocationService.java ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/core/org.cishell.reference/.classpath =================================================================== --- trunk/core/org.cishell.reference/.classpath 2011-12-20 18:49:16 UTC (rev 1295) +++ trunk/core/org.cishell.reference/.classpath 2011-12-20 22:45:48 UTC (rev 1296) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="output" path="bin"/> </classpath> Modified: trunk/core/org.cishell.reference/.project =================================================================== --- trunk/core/org.cishell.reference/.project 2011-12-20 18:49:16 UTC (rev 1295) +++ trunk/core/org.cishell.reference/.project 2011-12-20 22:45:48 UTC (rev 1296) @@ -1,34 +1,28 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.cishell.reference</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.cishell.reference</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Modified: trunk/core/org.cishell.reference/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/core/org.cishell.reference/.settings/org.eclipse.jdt.core.prefs 2011-12-20 18:49:16 UTC (rev 1295) +++ trunk/core/org.cishell.reference/.settings/org.eclipse.jdt.core.prefs 2011-12-20 22:45:48 UTC (rev 1296) @@ -1,4 +1,4 @@ -#Thu Dec 15 14:43:35 EST 2011 +#Wed Jul 21 20:42:37 EDT 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 @@ -9,5 +9,4 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.source=1.5 Deleted: trunk/core/org.cishell.reference/.settings/org.eclipse.m2e.core.prefs =================================================================== --- trunk/core/org.cishell.reference/.settings/org.eclipse.m2e.core.prefs 2011-12-20 18:49:16 UTC (rev 1295) +++ trunk/core/org.cishell.reference/.settings/org.eclipse.m2e.core.prefs 2011-12-20 22:45:48 UTC (rev 1296) @@ -1,5 +0,0 @@ -#Thu Dec 15 14:43:34 EST 2011 -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 Deleted: trunk/core/org.cishell.reference/pom.xml =================================================================== --- trunk/core/org.cishell.reference/pom.xml 2011-12-20 18:49:16 UTC (rev 1295) +++ trunk/core/org.cishell.reference/pom.xml 2011-12-20 22:45:48 UTC (rev 1296) @@ -1,26 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <artifactId>org.cishell.reference</artifactId> - <version>1.0.0</version> - <packaging>eclipse-plugin</packaging> - <parent> - <groupId>org.cishell</groupId> - <artifactId>plugin-parent</artifactId> - <version>0.0.1</version> - <relativePath>../plugin-parent/pom.xml</relativePath> - </parent> - - <build> - <sourceDirectory>src</sourceDirectory> - - </build> - <dependencies> - <dependency> - <groupId>jung</groupId> - <artifactId>jung</artifactId> - <version>1.7.5</version> - </dependency> - </dependencies> - -</project> \ No newline at end of file Property changes on: trunk/core/org.cishell.reference/src/org/cishell/reference/app/service/algorithminvocation/FakeAlgorithmInvocationServiceImpl.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.reference/src/org/cishell/reference/app/service/persistence/AbstractDialog.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.reference.service.database/src/org/cishell/reference/service/database/DerbyDatabaseService.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.reference.service.database/src/org/cishell/reference/service/database/ExternalDatabase.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.datastructure/src/org/cishell/utility/datastructure ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.datastructure/src/org/cishell/utility/datastructure/ObjectContainer.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.datastructure/src/org/cishell/utility/datastructure/datamodel/ModelDataSynchronizer.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.datastructure/src/org/cishell/utility/datastructure/datamodel/field/validation/FieldValidationAction.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.datastructure/src/org/cishell/utility/datastructure/datamodel/field/validation/FieldValidationRule.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/ExpandableComponentWidget.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/FileSaveAs.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/GUIBuilderUtilities.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/GUICanceledException.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/GridContainer.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/SWTUtilities.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/ScrolledComponentFactory.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/URLClickedListener.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/URLMouseCursorListener.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/model/ModelFieldException.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/model/SWTModel.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/model/SWTModelField.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/model/datasynchronizer ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/model/datasynchronizer/CheckBoxDataSynchronizer.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/model/datasynchronizer/DateDataSynchronizer.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/model/datasynchronizer/DropDownDataSynchronizer.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/model/datasynchronizer/SingleListSelectionDataSynchronizer.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/model/datasynchronizer/TextDataSynchronizer.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/core/org.cishell.utility.swt/src/org/cishell/utility/swt/model/datasynchronizer/TimeDataSynchronizer.java ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/deployment/org.cishell.environment.equinox.feature/.project =================================================================== --- trunk/deployment/org.cishell.environment.equinox.feature/.project 2011-12-20 18:49:16 UTC (rev 1295) +++ trunk/deployment/org.cishell.environment.equinox.feature/.project 2011-12-20 22:45:48 UTC (rev 1296) @@ -1,23 +1,17 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.cishell.environment.equinox.feature</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.pde.FeatureBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - <nature>org.eclipse.pde.FeatureNature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.cishell.environment.equinox.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + </natures> +</projectDescription> Deleted: trunk/deployment/org.cishell.environment.equinox.feature/pom.xml =================================================================== --- trunk/deployment/org.cishell.environment.equinox.feature/pom.xml 2011-12-20 18:49:16 UTC (rev 1295) +++ trunk/deployment/org.cishell.environment.equinox.feature/pom.xml 2011-12-20 22:45:48 UTC (rev 1296) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.cishell</groupId> - <artifactId>parent</artifactId> - <version>0.0.1</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - - <artifactId>org.cishell.environment.equinox.feature</artifactId> - <version>1.0.0</version> - <packaging>eclipse-feature</packaging> - -</project> \ No newline at end of file Modified: trunk/deployment/org.cishell.feature/.project =================================================================== --- trunk/deployment/org.cishell.feature/.project 2011-12-20 18:49:16 UTC (rev 1295) +++ trunk/deployment/org.cishell.feature/.project 2011-12-20 22:45:48 UTC (rev 1296) @@ -1,23 +1,17 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.cishell.feature</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.pde.FeatureBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - <nature>org.eclipse.pde.FeatureNature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.cishell.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + </natures> +</projectDescription> Modified: trunk/deployment/org.cishell.feature/feature.xml =================================================================== --- trunk/deployment/org.cishell.feature/feature.xml 2011-12-20 18:49:16 UTC (rev 1295) +++ trunk/deployment/org.cishell.feature/feature.xml 2011-12-20 22:45:48 UTC (rev 1296) @@ -1,18 +1,18 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.cishell.feature" - label="CIShell Framework API Feature" - version="1.0.0"> - - <description url="http://cishell.org"> - CIShell Framework API - </description> - - <copyright> - Copyright 2006 Indiana University - </copyright> - - <license url="http://www.apache.org/licenses/LICENSE-2.0"> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.cishell.feature" + label="CIShell Framework API Feature" + version="1.0.0"> + + <description url="http://cishell.org"> + CIShell Framework API + </description> + + <copyright> + Copyright 2006 Indiana University + </copyright> + + <license url="http://www.apache.org/licenses/LICENSE-2.0"> CIShell: Cyberinfrastructure Shell Copyright 2006 Indiana University Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,19 +28,19 @@ Bruce Herr (bh...@bh...) Weixia Huang (hu...@in...) Shashikant Penumarthy (sp...@in...) -Dr. Katy Borner (ka...@in...) - </license> - - <url> - <update label="CIShell Update Site" url="http://cishell.org/update"/> - <discovery label="CIShell Update Site" url="http://cishell.org/update"/> - </url> - - <plugin - id="org.cishell.framework" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> +Dr. Katy Borner (ka...@in...) + </license> + + <url> + <update label="CIShell Update Site" url="http://cishell.org/update"/> + <discovery label="CIShell Update Site" url="http://cishell.org/update"/> + </url> + + <plugin + id="org.cishell.framework" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> Deleted: trunk/deployment/org.cishell.feature/pom.xml =================================================================== --- trunk/deployment/org.cishell.feature/pom.xml 2011-12-20 18:49:16 UTC (rev 1295) +++ trunk/deployment/org.cishell.feature/pom.xml 2011-12-20 22:45:48 UTC (rev 1296) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.cishell</groupId> - <artifactId>parent</artifactId> - <version>0.0.1</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - - <artifactId>org.cishell.feature</artifactId> - <version>1.0.0</version> - <packaging>eclipse-feature</packaging> - -</project> \ No newline at end of file Property changes on: trunk/deployment/org.cishell.reference.releng ___________________________________________________________________ Deleted: svn:ignore - target Modified: trunk/deployment/org.cishell.reference.releng/.project =================================================================== --- trunk/deployment/org.cishell.reference.releng/.project 2011-12-20 18:49:16 UTC (rev 1295) +++ trunk/deployment/org.cishell.reference.releng/.project 2011-12-20 22:45:48 UTC (rev 1296) @@ -1,18 +1,12 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.cishell.reference.releng</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - <nature>org.pluginbuilder.core.pluginBuilderNature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.cishell.reference.releng</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + </buildSpec> + <natures> + <nature>org.pluginbuilder.core.pluginBuilderNature</nature> + </natures> +</projectDescription> Modified: trunk/deployment/org.cishell.reference.releng/cishell.product =================================================================== --- trunk/deployment/org.cishell.reference.releng/cishell.product 2011-12-20 18:49:16 UTC (rev 1295) +++ trunk/deployment/org.cishell.reference.releng/cishell.product 2011-12-20 22:45:48 UTC (rev 1296) @@ -1,64 +1,53 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?pde version="3.5"?> - -<product name="Cyberinfrastructure Shell" uid="cishell" id="org.cishell.reference.gui.brand.cishell.cishell" application="org.cishell.reference.gui.workspace.CIShellApplication" version="0.0.1" useFeatures="true" includeLaunchers="true"> - - <aboutInfo> - <image path="icons/about.gif"/> - <text> - %blurb - </text> - </aboutInfo> - - <configIni use="default"> - <linux>/org.cishell.reference.gui.brand.cishell/extra-files/configuration/config.ini</linux> - <macosx>/org.cishell.reference.gui.brand.cishell/extra-files/configuration/config.ini</macosx> - <solaris>/org.cishell.reference.gui.brand.cishell/extra-files/configuration/config.ini</solaris> - <win32>/org.cishell.reference.gui.brand.cishell/extra-files/configuration/config.ini</win32> - </configIni> - - <configurations> - <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" /> - <plugin id="org.eclipse.equinox.log" autoStart="true" startLevel="4" /> - </configurations> - <launcherArgs> - </launcherArgs> - - <windowImages/> - - <splash - location="org.cishell.reference.gui.brand.cishell" - startupProgressRect="0,163,500,10" /> - <launcher name="cishell"> - <linux icon="/org.cishell.reference.gui.brand.cishell/icons/cishell.xpm"/> - <macosx icon="/org.cishell.reference.gui.brand.cishell/icons/cishell.icns"/> - <solaris/> - <win useIco="true"> - <ico path="/org.cishell.reference.gui.brand.cishell/icons/cishell.ico"/> - <bmp - winSmallHigh="icons/ivc_sm_32.bmp" - winSmallLow="icons/ivc_sm_16.bmp" - winMediumHigh="icons/ivc_lg_32.bmp" - winMediumLow="icons/ivc_lg_16.bmp" - winLargeHigh="icons/ivc_xlg_32.bmp" - winLargeLow="icons/ivc_xlg_16.bmp"/> - </win> - </launcher> - - <vm> - </vm> - - <plugins> - </plugins> - - <features> - <feature id="org.cishell.environment.equinox.feature"/> - <feature id="org.cishell.feature" version="1.0.0"/> - <feature id="org.cishell.reference.feature"/> - <feature id="org.cishell.reference.gui.feature"/> - <feature id="org.cishell.reference.gui.brand.feature"/> - </features> - - - -</product> +<?xml version="1.0" encoding="UTF-8"?> +<?pde version="3.1"?> + +<product name="Cyberinfrastructure Shell" id="org.cishell.reference.gui.brand.cishell.cishell" application="org.cishell.reference.gui.workspace.CIShellApplication" useFeatures="true"> + + <aboutInfo> + <image path="icons/about.gif"/> + <text> + %blurb + </text> + </aboutInfo> + + <configIni use="custom" path="/org.cishell.reference.gui.brand.cishell/extra-files/configuration/config.ini"/> + + <launcherArgs> + </launcherArgs> + + <windowImages/> + + <splash + location="org.cishell.reference.gui.brand.cishell" + startupProgressRect="0,163,500,10" /> + <launcher name="cishell"> + <linux icon="/org.cishell.reference.gui.brand.cishell/icons/cishell.xpm"/> + <macosx icon="/org.cishell.reference.gui.brand.cishell/icons/cishell.icns"/> + <solaris/> + <win useIco="true"> + <ico path="/org.cishell.reference.gui.brand.cishell/icons/cishell.ico"/> + <bmp + winSmallHigh="icons/ivc_sm_32.bmp" + winSmallLow="icons/ivc_sm_16.bmp" + winMediumHigh="icons/ivc_lg_32.bmp" + winMediumLow="icons/ivc_lg_16.bmp" + winLargeHigh="icons/ivc_xlg_32.bmp" + winLargeLow="icons/ivc_xlg_16.bmp"/> + </win> + </launcher> + + <vm> + </vm> + + <plugins> + </plugins> + + <features> + <feature id="org.cishell.environment.equinox.feature" version="0.0.0"/> + <feature id="org.cishell.feature" version="0.3.0"/> + <feature id="org.cishell.reference.feature" version="0.4.0"/> + <feature id="org.cishell.reference.gui.feature" version="0.4.0"/> + <feature id="org.cishell.reference.gui.brand.feature" version="0.8.0"/> + </features> + +</product> Deleted: trunk/deployment/org.cishell.reference.releng/pom.xml =================================================================== --- trunk/deployment/org.cishell.reference.releng/pom.xml 2011-12-20 18:49:16 UTC (rev 1295) +++ trunk/deployment/org.cishell.reference.releng/pom.xml 2011-12-20 22:45:48 UTC (rev 1296) @@ -1,39 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>plugin-parent</artifactId> - <groupId>org.cishell</groupId> - <version>0.0.1</version> - </parent> - <artifactId>cishell</artifactId> - <version>0.0.1</version> - <packaging>eclipse-repository</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-director-plugin</artifactId> - <version>${tychoVersion}</version> - <executions> - <execution> - <id>materialize-products</id> - <goals> - <goal>materialize-products</goal> - </goals> - </execution> - <execution> - <id>archive-products</id> - <goals> - <goal>archive-products</goal> - </goals> - </execution> - </executions> - <configuration> - <includeAllDependencies>true</includeAllDependencies> - </configuration> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file Property changes on: trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/staticexecutable/optiontypes/PlatformOption.java ___________________________________________________________________ Deleted: svn:mergeinfo - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |