[CIShell-SVN] SF.net SVN: cishell:[1296] trunk

[<re...@us...>]

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 &quot;License&quot;);
@@ -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.