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

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

Revision: 1285
          http://cishell.svn.sourceforge.net/cishell/?rev=1285&view=rev
Author:   rescdsk
Date:     2011-12-20 16:54:45 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
Maven-ify!

Modified Paths:
--------------
    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

Added Paths:
-----------
    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/.settings/org.eclipse.m2e.core.prefs
    trunk/deployment/org.cishell.environment.equinox.feature/pom.xml
    trunk/deployment/org.cishell.feature/.settings/
    trunk/deployment/org.cishell.feature/.settings/org.eclipse.m2e.core.prefs
    trunk/deployment/org.cishell.feature/pom.xml

Modified: trunk/core/org.cishell.framework/.classpath
===================================================================
--- trunk/core/org.cishell.framework/.classpath	2011-12-20 16:52:35 UTC (rev 1284)
+++ trunk/core/org.cishell.framework/.classpath	2011-12-20 16:54:45 UTC (rev 1285)
@@ -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="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: trunk/core/org.cishell.framework/.project
===================================================================
--- trunk/core/org.cishell.framework/.project	2011-12-20 16:52:35 UTC (rev 1284)
+++ trunk/core/org.cishell.framework/.project	2011-12-20 16:54:45 UTC (rev 1285)
@@ -1,28 +1,34 @@
-<?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>
+<?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>

Added: trunk/core/org.cishell.framework/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/core/org.cishell.framework/.settings/org.eclipse.core.resources.prefs	                        (rev 0)
+++ trunk/core/org.cishell.framework/.settings/org.eclipse.core.resources.prefs	2011-12-20 16:54:45 UTC (rev 1285)
@@ -0,0 +1,3 @@
+#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 16:52:35 UTC (rev 1284)
+++ trunk/core/org.cishell.framework/.settings/org.eclipse.jdt.core.prefs	2011-12-20 16:54:45 UTC (rev 1285)
@@ -1,4 +1,4 @@
-#Fri Jun 11 22:41:08 EDT 2010
+#Fri Dec 09 14:04:21 EST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
@@ -9,4 +9,5 @@
 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

Added: trunk/core/org.cishell.framework/.settings/org.eclipse.m2e.core.prefs
===================================================================
--- trunk/core/org.cishell.framework/.settings/org.eclipse.m2e.core.prefs	                        (rev 0)
+++ trunk/core/org.cishell.framework/.settings/org.eclipse.m2e.core.prefs	2011-12-20 16:54:45 UTC (rev 1285)
@@ -0,0 +1,5 @@
+#Fri Dec 09 13:55:42 EST 2011
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

Added: trunk/core/org.cishell.framework/pom.xml
===================================================================
--- trunk/core/org.cishell.framework/pom.xml	                        (rev 0)
+++ trunk/core/org.cishell.framework/pom.xml	2011-12-20 16:54:45 UTC (rev 1285)
@@ -0,0 +1,18 @@
+<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

Modified: trunk/core/org.cishell.reference/.classpath
===================================================================
--- trunk/core/org.cishell.reference/.classpath	2011-12-20 16:52:35 UTC (rev 1284)
+++ trunk/core/org.cishell.reference/.classpath	2011-12-20 16:54:45 UTC (rev 1285)
@@ -1,7 +1,7 @@
 <?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.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="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: trunk/core/org.cishell.reference/.project
===================================================================
--- trunk/core/org.cishell.reference/.project	2011-12-20 16:52:35 UTC (rev 1284)
+++ trunk/core/org.cishell.reference/.project	2011-12-20 16:54:45 UTC (rev 1285)
@@ -1,28 +1,34 @@
-<?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>
+<?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>

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 16:52:35 UTC (rev 1284)
+++ trunk/core/org.cishell.reference/.settings/org.eclipse.jdt.core.prefs	2011-12-20 16:54:45 UTC (rev 1285)
@@ -1,4 +1,4 @@
-#Wed Jul 21 20:42:37 EDT 2010
+#Thu Dec 15 14:43:35 EST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
@@ -9,4 +9,5 @@
 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

Added: trunk/core/org.cishell.reference/.settings/org.eclipse.m2e.core.prefs
===================================================================
--- trunk/core/org.cishell.reference/.settings/org.eclipse.m2e.core.prefs	                        (rev 0)
+++ trunk/core/org.cishell.reference/.settings/org.eclipse.m2e.core.prefs	2011-12-20 16:54:45 UTC (rev 1285)
@@ -0,0 +1,5 @@
+#Thu Dec 15 14:43:34 EST 2011
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

Added: trunk/core/org.cishell.reference/pom.xml
===================================================================
--- trunk/core/org.cishell.reference/pom.xml	                        (rev 0)
+++ trunk/core/org.cishell.reference/pom.xml	2011-12-20 16:54:45 UTC (rev 1285)
@@ -0,0 +1,26 @@
+<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

Modified: trunk/deployment/org.cishell.environment.equinox.feature/.project
===================================================================
--- trunk/deployment/org.cishell.environment.equinox.feature/.project	2011-12-20 16:52:35 UTC (rev 1284)
+++ trunk/deployment/org.cishell.environment.equinox.feature/.project	2011-12-20 16:54:45 UTC (rev 1285)
@@ -1,17 +1,23 @@
-<?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>
+<?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>

Added: trunk/deployment/org.cishell.environment.equinox.feature/.settings/org.eclipse.m2e.core.prefs
===================================================================
--- trunk/deployment/org.cishell.environment.equinox.feature/.settings/org.eclipse.m2e.core.prefs	                        (rev 0)
+++ trunk/deployment/org.cishell.environment.equinox.feature/.settings/org.eclipse.m2e.core.prefs	2011-12-20 16:54:45 UTC (rev 1285)
@@ -0,0 +1,5 @@
+#Mon Dec 19 10:09:04 EST 2011
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

Added: trunk/deployment/org.cishell.environment.equinox.feature/pom.xml
===================================================================
--- trunk/deployment/org.cishell.environment.equinox.feature/pom.xml	                        (rev 0)
+++ trunk/deployment/org.cishell.environment.equinox.feature/pom.xml	2011-12-20 16:54:45 UTC (rev 1285)
@@ -0,0 +1,18 @@
+<?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 16:52:35 UTC (rev 1284)
+++ trunk/deployment/org.cishell.feature/.project	2011-12-20 16:54:45 UTC (rev 1285)
@@ -1,17 +1,23 @@
-<?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>
+<?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>

Added: trunk/deployment/org.cishell.feature/.settings/org.eclipse.m2e.core.prefs
===================================================================
--- trunk/deployment/org.cishell.feature/.settings/org.eclipse.m2e.core.prefs	                        (rev 0)
+++ trunk/deployment/org.cishell.feature/.settings/org.eclipse.m2e.core.prefs	2011-12-20 16:54:45 UTC (rev 1285)
@@ -0,0 +1,5 @@
+#Thu Dec 15 14:28:47 EST 2011
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

Modified: trunk/deployment/org.cishell.feature/feature.xml
===================================================================
--- trunk/deployment/org.cishell.feature/feature.xml	2011-12-20 16:52:35 UTC (rev 1284)
+++ trunk/deployment/org.cishell.feature/feature.xml	2011-12-20 16:54:45 UTC (rev 1285)
@@ -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>

Added: trunk/deployment/org.cishell.feature/pom.xml
===================================================================
--- trunk/deployment/org.cishell.feature/pom.xml	                        (rev 0)
+++ trunk/deployment/org.cishell.feature/pom.xml	2011-12-20 16:54:45 UTC (rev 1285)
@@ -0,0 +1,18 @@
+<?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

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.