From: <mwl...@us...> - 2009-01-02 17:57:36
|
Revision: 825 http://cishell.svn.sourceforge.net/cishell/?rev=825&view=rev Author: mwlinnem Date: 2009-01-02 17:57:02 +0000 (Fri, 02 Jan 2009) Log Message: ----------- Initial commit. Added Paths: ----------- trunk/core/org.cishell.service.database/.classpath trunk/core/org.cishell.service.database/.project trunk/core/org.cishell.service.database/.settings/ trunk/core/org.cishell.service.database/META-INF/ trunk/core/org.cishell.service.database/META-INF/MANIFEST.MF trunk/core/org.cishell.service.database/build.properties trunk/core/org.cishell.service.database/javadoc.xml trunk/core/org.cishell.service.database/lib/ trunk/core/org.cishell.service.database/lib/osgi.compendium.jar trunk/core/org.cishell.service.database/lib/osgi.core.jar trunk/core/org.cishell.service.database/src/ trunk/core/org.cishell.service.database/src/org/ trunk/core/org.cishell.service.database/src/org/cishell/ trunk/core/org.cishell.service.database/src/org/cishell/service/ trunk/core/org.cishell.service.database/src/org/cishell/service/database/ trunk/core/org.cishell.service.database/src/org/cishell/service/database/databasefactory/ trunk/core/org.cishell.service.database/src/org/cishell/service/database/databasefactory/DatabaseCreationException.java trunk/core/org.cishell.service.database/src/org/cishell/service/database/databasefactory/DatabaseFactory.java Added: trunk/core/org.cishell.service.database/.classpath =================================================================== --- trunk/core/org.cishell.service.database/.classpath (rev 0) +++ trunk/core/org.cishell.service.database/.classpath 2009-01-02 17:57:02 UTC (rev 825) @@ -0,0 +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.pde.core.requiredPlugins"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: trunk/core/org.cishell.service.database/.project =================================================================== --- trunk/core/org.cishell.service.database/.project (rev 0) +++ trunk/core/org.cishell.service.database/.project 2009-01-02 17:57:02 UTC (rev 825) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.cishell.service.database</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/core/org.cishell.service.database/META-INF/MANIFEST.MF =================================================================== --- trunk/core/org.cishell.service.database/META-INF/MANIFEST.MF (rev 0) +++ trunk/core/org.cishell.service.database/META-INF/MANIFEST.MF 2009-01-02 17:57:02 UTC (rev 825) @@ -0,0 +1,12 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: CIShell Platform API +Bundle-SymbolicName: org.cishell.framework +Bundle-Version: 1.0.0 +Bundle-Vendor: Cyberinfrastructure for Network Science Center +Import-Package: org.osgi.framework, + org.osgi.service.log, + org.osgi.service.metatype, + org.osgi.service.prefs +Export-Package: +Bundle-ActivationPolicy: lazy Added: trunk/core/org.cishell.service.database/build.properties =================================================================== --- trunk/core/org.cishell.service.database/build.properties (rev 0) +++ trunk/core/org.cishell.service.database/build.properties 2009-01-02 17:57:02 UTC (rev 825) @@ -0,0 +1,5 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + bin/ Added: trunk/core/org.cishell.service.database/javadoc.xml =================================================================== --- trunk/core/org.cishell.service.database/javadoc.xml (rev 0) +++ trunk/core/org.cishell.service.database/javadoc.xml 2009-01-02 17:57:02 UTC (rev 825) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project default="javadoc"> + <property name="version" value="1.0" /> + <target name="javadoc"> + <javadoc destdir="bin/doc" + access="public" + source="1.4" + use="true" + notree="false" + nonavbar="false" + noindex="false" + splitindex="true" + author="true" + version="true" + nodeprecatedlist="false" + nodeprecated="false" + packagenames="org.cishell.framework.data,org.cishell.framework.userprefs,org.cishell.service.guibuilder,org.cishell.app.service.scheduler,org.cishell.framework,org.cishell.app.service.datamanager,org.cishell.framework.algorithm,org.cishell.service.conversion" + sourcepath="src" + classpath="lib/osgi.core.jar:lib/osgi.compendium.jar" + overview="src/org/cishell/overview.html" + doctitle="CIShell: Cyberinfrastructure Shell v${version} API"> + <link href="http://bundles.osgi.org/javadoc/r4/"/> + <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/> + </javadoc> + </target> +</project> Added: trunk/core/org.cishell.service.database/lib/osgi.compendium.jar =================================================================== (Binary files differ) Property changes on: trunk/core/org.cishell.service.database/lib/osgi.compendium.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/core/org.cishell.service.database/lib/osgi.core.jar =================================================================== (Binary files differ) Property changes on: trunk/core/org.cishell.service.database/lib/osgi.core.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/core/org.cishell.service.database/src/org/cishell/service/database/databasefactory/DatabaseCreationException.java =================================================================== --- trunk/core/org.cishell.service.database/src/org/cishell/service/database/databasefactory/DatabaseCreationException.java (rev 0) +++ trunk/core/org.cishell.service.database/src/org/cishell/service/database/databasefactory/DatabaseCreationException.java 2009-01-02 17:57:02 UTC (rev 825) @@ -0,0 +1,25 @@ +package org.cishell.service.database.databasefactory; + +public class DatabaseCreationException extends Exception { + + private static final long serialVersionUID = 1L; + + //Constructors from Exception superclass + + public DatabaseCreationException() { + super(); + } + + public DatabaseCreationException(String arg0) { + super(arg0); + } + + public DatabaseCreationException(Throwable arg0) { + super(arg0); + } + + public DatabaseCreationException(String arg0, Throwable arg1) { + super(arg0, arg1); + } + +} Added: trunk/core/org.cishell.service.database/src/org/cishell/service/database/databasefactory/DatabaseFactory.java =================================================================== --- trunk/core/org.cishell.service.database/src/org/cishell/service/database/databasefactory/DatabaseFactory.java (rev 0) +++ trunk/core/org.cishell.service.database/src/org/cishell/service/database/databasefactory/DatabaseFactory.java 2009-01-02 17:57:02 UTC (rev 825) @@ -0,0 +1,8 @@ +package org.cishell.service.database.databasefactory; + +import javax.sql.DataSource; + +public interface DatabaseFactory { + + public DataSource createDatabase() throws DatabaseCreationException; +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mwl...@us...> - 2009-01-13 16:20:24
|
Revision: 831 http://cishell.svn.sourceforge.net/cishell/?rev=831&view=rev Author: mwlinnem Date: 2009-01-13 16:20:12 +0000 (Tue, 13 Jan 2009) Log Message: ----------- Changed package name to better express contents. Modified Paths: -------------- trunk/core/org.cishell.service.database/META-INF/MANIFEST.MF Added Paths: ----------- trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseCopyException.java trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseCreationException.java trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseService.java Removed Paths: ------------- trunk/core/org.cishell.service.database/src/org/cishell/service/database/databasefactory/ Modified: trunk/core/org.cishell.service.database/META-INF/MANIFEST.MF =================================================================== --- trunk/core/org.cishell.service.database/META-INF/MANIFEST.MF 2009-01-13 15:26:57 UTC (rev 830) +++ trunk/core/org.cishell.service.database/META-INF/MANIFEST.MF 2009-01-13 16:20:12 UTC (rev 831) @@ -9,5 +9,5 @@ org.osgi.service.metatype, org.osgi.service.prefs Export-Package: - org.cishell.service.database.databasefactory + org.cishell.service.database Bundle-ActivationPolicy: lazy Copied: trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseCopyException.java (from rev 830, trunk/core/org.cishell.service.database/src/org/cishell/service/database/databasefactory/DatabaseCopyException.java) =================================================================== --- trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseCopyException.java (rev 0) +++ trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseCopyException.java 2009-01-13 16:20:12 UTC (rev 831) @@ -0,0 +1,38 @@ +/* **************************************************************************** + * CIShell: Cyberinfrastructure Shell, An Algorithm Integration Framework. + * + * All rights reserved. This program and the accompanying materials are made + * available under the terms of the Apache License v2.0 which accompanies + * this distribution, and is available at: + * http://www.apache.org/licenses/LICENSE-2.0.html + * + * Created on Jan 13, 2009 at Indiana University. + * + * Contributors: + * Indiana University - + * ***************************************************************************/ +package org.cishell.service.database; + +public class DatabaseCopyException extends Exception { + + private static final long serialVersionUID = 1L; + + //Constructors from Exception superclass + + public DatabaseCopyException() { + super(); + } + + public DatabaseCopyException(String arg0) { + super(arg0); + } + + public DatabaseCopyException(Throwable arg0) { + super(arg0); + } + + public DatabaseCopyException(String arg0, Throwable arg1) { + super(arg0, arg1); + } + +} Property changes on: trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseCopyException.java ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseCreationException.java (from rev 829, trunk/core/org.cishell.service.database/src/org/cishell/service/database/databasefactory/DatabaseCreationException.java) =================================================================== --- trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseCreationException.java (rev 0) +++ trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseCreationException.java 2009-01-13 16:20:12 UTC (rev 831) @@ -0,0 +1,25 @@ +package org.cishell.service.database; + +public class DatabaseCreationException extends Exception { + + private static final long serialVersionUID = 1L; + + //Constructors from Exception superclass + + public DatabaseCreationException() { + super(); + } + + public DatabaseCreationException(String arg0) { + super(arg0); + } + + public DatabaseCreationException(Throwable arg0) { + super(arg0); + } + + public DatabaseCreationException(String arg0, Throwable arg1) { + super(arg0, arg1); + } + +} Property changes on: trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseCreationException.java ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseService.java (from rev 830, trunk/core/org.cishell.service.database/src/org/cishell/service/database/databasefactory/DatabaseService.java) =================================================================== --- trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseService.java (rev 0) +++ trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseService.java 2009-01-13 16:20:12 UTC (rev 831) @@ -0,0 +1,9 @@ +package org.cishell.service.database; + +import javax.sql.DataSource; + +public interface DatabaseService { + + public DataSource createDatabase() throws DatabaseCreationException; + public DataSource copyDatabase(DataSource database) throws DatabaseCopyException; +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mwl...@us...> - 2009-01-15 23:56:17
|
Revision: 841 http://cishell.svn.sourceforge.net/cishell/?rev=841&view=rev Author: mwlinnem Date: 2009-01-15 21:38:00 +0000 (Thu, 15 Jan 2009) Log Message: ----------- Initial import. Same code as the old one, but a working plugin setup. Added Paths: ----------- trunk/core/org.cishell.service.database/.classpath trunk/core/org.cishell.service.database/.project trunk/core/org.cishell.service.database/.settings/ trunk/core/org.cishell.service.database/META-INF/ trunk/core/org.cishell.service.database/META-INF/MANIFEST.MF trunk/core/org.cishell.service.database/build.properties trunk/core/org.cishell.service.database/src/ trunk/core/org.cishell.service.database/src/org/ trunk/core/org.cishell.service.database/src/org/cishell/ trunk/core/org.cishell.service.database/src/org/cishell/service/ trunk/core/org.cishell.service.database/src/org/cishell/service/database/ trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseCopyException.java trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseCreationException.java trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseService.java Added: trunk/core/org.cishell.service.database/.classpath =================================================================== --- trunk/core/org.cishell.service.database/.classpath (rev 0) +++ trunk/core/org.cishell.service.database/.classpath 2009-01-15 21:38:00 UTC (rev 841) @@ -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.4"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: trunk/core/org.cishell.service.database/.project =================================================================== --- trunk/core/org.cishell.service.database/.project (rev 0) +++ trunk/core/org.cishell.service.database/.project 2009-01-15 21:38:00 UTC (rev 841) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.cishell.service.database</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/core/org.cishell.service.database/META-INF/MANIFEST.MF =================================================================== --- trunk/core/org.cishell.service.database/META-INF/MANIFEST.MF (rev 0) +++ trunk/core/org.cishell.service.database/META-INF/MANIFEST.MF 2009-01-15 21:38:00 UTC (rev 841) @@ -0,0 +1,7 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Database Plug-in +Bundle-SymbolicName: org.cishell.service.database +Bundle-Version: 1.0.0 +Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Export-Package: org.cishell.service.database Added: trunk/core/org.cishell.service.database/build.properties =================================================================== --- trunk/core/org.cishell.service.database/build.properties (rev 0) +++ trunk/core/org.cishell.service.database/build.properties 2009-01-15 21:38:00 UTC (rev 841) @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . Added: trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseCopyException.java =================================================================== --- trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseCopyException.java (rev 0) +++ trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseCopyException.java 2009-01-15 21:38:00 UTC (rev 841) @@ -0,0 +1,38 @@ +/* **************************************************************************** + * CIShell: Cyberinfrastructure Shell, An Algorithm Integration Framework. + * + * All rights reserved. This program and the accompanying materials are made + * available under the terms of the Apache License v2.0 which accompanies + * this distribution, and is available at: + * http://www.apache.org/licenses/LICENSE-2.0.html + * + * Created on Jan 13, 2009 at Indiana University. + * + * Contributors: + * Indiana University - + * ***************************************************************************/ +package org.cishell.service.database; + +public class DatabaseCopyException extends Exception { + + private static final long serialVersionUID = 1L; + + //Constructors from Exception superclass + + public DatabaseCopyException() { + super(); + } + + public DatabaseCopyException(String arg0) { + super(arg0); + } + + public DatabaseCopyException(Throwable arg0) { + super(arg0); + } + + public DatabaseCopyException(String arg0, Throwable arg1) { + super(arg0, arg1); + } + +} Added: trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseCreationException.java =================================================================== --- trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseCreationException.java (rev 0) +++ trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseCreationException.java 2009-01-15 21:38:00 UTC (rev 841) @@ -0,0 +1,25 @@ +package org.cishell.service.database; + +public class DatabaseCreationException extends Exception { + + private static final long serialVersionUID = 1L; + + //Constructors from Exception superclass + + public DatabaseCreationException() { + super(); + } + + public DatabaseCreationException(String arg0) { + super(arg0); + } + + public DatabaseCreationException(Throwable arg0) { + super(arg0); + } + + public DatabaseCreationException(String arg0, Throwable arg1) { + super(arg0, arg1); + } + +} Added: trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseService.java =================================================================== --- trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseService.java (rev 0) +++ trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseService.java 2009-01-15 21:38:00 UTC (rev 841) @@ -0,0 +1,9 @@ +package org.cishell.service.database; + +import javax.sql.DataSource; + +public interface DatabaseService { + + public DataSource createDatabase() throws DatabaseCreationException; + public DataSource copyDatabase(DataSource database) throws DatabaseCopyException; +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pat...@us...> - 2009-01-21 20:56:38
|
Revision: 845 http://cishell.svn.sourceforge.net/cishell/?rev=845&view=rev Author: pataphil Date: 2009-01-21 20:56:31 +0000 (Wed, 21 Jan 2009) Log Message: ----------- Implemented part of the database service, but didn't finish. Modified Paths: -------------- trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseService.java Added Paths: ----------- trunk/core/org.cishell.service.database/.settings/org.eclipse.jdt.core.prefs trunk/core/org.cishell.service.database/src/org/cishell/service/database/DataSourceWithID.java Added: trunk/core/org.cishell.service.database/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/core/org.cishell.service.database/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/core/org.cishell.service.database/.settings/org.eclipse.jdt.core.prefs 2009-01-21 20:56:31 UTC (rev 845) @@ -0,0 +1,12 @@ +#Wed Jan 21 13:34:47 EST 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.source=1.3 Added: trunk/core/org.cishell.service.database/src/org/cishell/service/database/DataSourceWithID.java =================================================================== --- trunk/core/org.cishell.service.database/src/org/cishell/service/database/DataSourceWithID.java (rev 0) +++ trunk/core/org.cishell.service.database/src/org/cishell/service/database/DataSourceWithID.java 2009-01-21 20:56:31 UTC (rev 845) @@ -0,0 +1,56 @@ +package org.cishell.service.database; + +import java.io.PrintWriter; +import java.sql.Connection; +import java.sql.SQLException; + +import javax.sql.DataSource; + +public class DataSourceWithID implements DataSource { + private static int idCounter = 0; + + private DataSource wrappedDataSource; + private int id; + + private static int generateNewID() { + int newID = idCounter; + + idCounter++; + + return newID; + } + + public DataSourceWithID(DataSource wrappedDataSource) { + this.wrappedDataSource = wrappedDataSource; + this.id = generateNewID(); + } + + public int getID() { + return id; + } + + public Connection getConnection() throws SQLException { + return this.wrappedDataSource.getConnection(); + } + + public Connection getConnection(String username, String password) + throws SQLException { + return this.wrappedDataSource.getConnection(username, password); + } + + public PrintWriter getLogWriter() throws SQLException { + return this.wrappedDataSource.getLogWriter(); + } + + public void setLogWriter(PrintWriter out) throws SQLException { + this.wrappedDataSource.setLogWriter(out); + } + + public int getLoginTimeout() throws SQLException { + return this.wrappedDataSource.getLoginTimeout(); + } + + public void setLoginTimeout(int seconds) throws SQLException { + this.wrappedDataSource.setLoginTimeout(seconds); + } +} \ No newline at end of file Modified: trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseService.java =================================================================== --- trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseService.java 2009-01-20 16:45:20 UTC (rev 844) +++ trunk/core/org.cishell.service.database/src/org/cishell/service/database/DatabaseService.java 2009-01-21 20:56:31 UTC (rev 845) @@ -6,7 +6,7 @@ public interface DatabaseService { - public DataSource createDatabase() throws DatabaseCreationException; - public DataSource createDatabase(ResultSet resultSet) throws DatabaseCreationException; - public DataSource copyDatabase(DataSource database) throws DatabaseCopyException; + public DataSourceWithID createDatabase() throws DatabaseCreationException; + public DataSourceWithID createDatabase(ResultSet resultSet) throws DatabaseCreationException; + public DataSourceWithID copyDatabase(DataSourceWithID database) throws DatabaseCopyException; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |