You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(121) |
May
(188) |
Jun
(134) |
Jul
(115) |
Aug
(201) |
Sep
(22) |
Oct
(22) |
Nov
(15) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(20) |
Feb
(4) |
Mar
(1) |
Apr
(84) |
May
(107) |
Jun
(101) |
Jul
(131) |
Aug
(66) |
Sep
(55) |
Oct
(189) |
Nov
(164) |
Dec
(60) |
| 2006 |
Jan
(75) |
Feb
(107) |
Mar
(117) |
Apr
(115) |
May
(91) |
Jun
(91) |
Jul
(225) |
Aug
(151) |
Sep
(117) |
Oct
(165) |
Nov
(263) |
Dec
(233) |
| 2007 |
Jan
(244) |
Feb
(116) |
Mar
(185) |
Apr
(263) |
May
(149) |
Jun
(292) |
Jul
(260) |
Aug
(306) |
Sep
(130) |
Oct
(61) |
Nov
(103) |
Dec
(144) |
| 2008 |
Jan
(112) |
Feb
(55) |
Mar
(116) |
Apr
(76) |
May
(69) |
Jun
(130) |
Jul
(75) |
Aug
(56) |
Sep
(76) |
Oct
(87) |
Nov
(403) |
Dec
(410) |
| 2009 |
Jan
(132) |
Feb
(168) |
Mar
(197) |
Apr
(67) |
May
(8) |
Jun
(44) |
Jul
(144) |
Aug
(126) |
Sep
(88) |
Oct
(3) |
Nov
(81) |
Dec
(97) |
| 2010 |
Jan
(238) |
Feb
(41) |
Mar
(61) |
Apr
(37) |
May
(31) |
Jun
(22) |
Jul
(92) |
Aug
(105) |
Sep
(46) |
Oct
(45) |
Nov
(55) |
Dec
(92) |
| 2011 |
Jan
(51) |
Feb
(21) |
Mar
(57) |
Apr
(20) |
May
(32) |
Jun
(29) |
Jul
(26) |
Aug
(50) |
Sep
(59) |
Oct
(25) |
Nov
(79) |
Dec
(2) |
| 2012 |
Jan
(14) |
Feb
(31) |
Mar
(11) |
Apr
(9) |
May
(13) |
Jun
(9) |
Jul
(6) |
Aug
(12) |
Sep
(16) |
Oct
(37) |
Nov
(12) |
Dec
(7) |
| 2013 |
Jan
(9) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <man...@us...> - 2010-08-21 17:36:21
|
Revision: 5808
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5808&view=rev
Author: manningr
Date: 2010-08-21 17:36:13 +0000 (Sat, 21 Aug 2010)
Log Message:
-----------
Initial changes to convert from Ant build to Maven build
Added Paths:
-----------
trunk/sql12/plugins/cache/pom.xml
trunk/sql12/plugins/cache/src/main/
trunk/sql12/plugins/cache/src/main/java/
trunk/sql12/plugins/cache/src/main/java/com/
trunk/sql12/plugins/cache/src/main/java/com/intersys/
trunk/sql12/plugins/cache/src/main/java/com/intersys/classes/
trunk/sql12/plugins/cache/src/main/java/com/intersys/classes/SYSTEM/
trunk/sql12/plugins/cache/src/main/java/com/intersys/classes/SYSTEM/Process.java
trunk/sql12/plugins/cache/src/main/java/de/
trunk/sql12/plugins/cache/src/main/java/de/ixdb/
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/CachePlugin.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/CachePluginResources.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/CdlAccessor.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/NamespaceCtrl.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/NamespaceCtrlListener.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/NamespaceDlg.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/ProcessData.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/ProcessListPanel.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/ProcessListTab.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/ProcessListTabListener.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/QueryPlanPanel.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/QueryPlanTab.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/QueryPlanTabListener.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/ScriptCdlAction.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/ScriptCdlCommand.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/ScriptFunctionAction.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/ScriptFunctionCommand.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/ScriptViewAction.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/ScriptViewCommand.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/ShowNamespacesAction.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/ShowNamespacesCommand.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/ShowProcessesAction.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/ShowProcessesCommand.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/ShowQueryPlanAction.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/ShowQueryPlanCommand.java
trunk/sql12/plugins/cache/src/main/java/de/ixdb/squirrel_sql/plugins/cache/VersionInfo.java
trunk/sql12/plugins/cache/src/main/resources/
trunk/sql12/plugins/cache/src/main/resources/de/
trunk/sql12/plugins/cache/src/main/resources/de/ixdb/
trunk/sql12/plugins/cache/src/main/resources/de/ixdb/squirrel_sql/
trunk/sql12/plugins/cache/src/main/resources/de/ixdb/squirrel_sql/plugins/
trunk/sql12/plugins/cache/src/main/resources/de/ixdb/squirrel_sql/plugins/cache/
trunk/sql12/plugins/cache/src/main/resources/de/ixdb/squirrel_sql/plugins/cache/I18NStrings.properties
trunk/sql12/plugins/cache/src/main/resources/de/ixdb/squirrel_sql/plugins/cache/cache.properties
trunk/sql12/plugins/cache/src/main/resources/de/ixdb/squirrel_sql/plugins/cache/images/
trunk/sql12/plugins/cache/src/main/resources/de/ixdb/squirrel_sql/plugins/cache/images/namespaces.gif
trunk/sql12/plugins/cache/src/main/resources/de/ixdb/squirrel_sql/plugins/cache/images/processinfo.gif
trunk/sql12/plugins/cache/src/main/resources/de/ixdb/squirrel_sql/plugins/cache/images/showexecplan.gif
trunk/sql12/plugins/cache/src/main/resources/doc/
Removed Paths:
-------------
trunk/sql12/plugins/cache/doc/
trunk/sql12/plugins/cache/plugin_build.xml
trunk/sql12/plugins/cache/src/com/intersys/classes/SYSTEM/Process.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/CachePlugin.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/CachePluginResources.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/CdlAccessor.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/I18NStrings.properties
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/NamespaceCtrl.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/NamespaceCtrlListener.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/NamespaceDlg.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ProcessData.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ProcessListPanel.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ProcessListTab.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ProcessListTabListener.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/QueryPlanPanel.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/QueryPlanTab.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/QueryPlanTabListener.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ScriptCdlAction.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ScriptCdlCommand.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ScriptFunctionAction.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ScriptFunctionCommand.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ScriptViewAction.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ScriptViewCommand.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ShowNamespacesAction.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ShowNamespacesCommand.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ShowProcessesAction.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ShowProcessesCommand.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ShowQueryPlanAction.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ShowQueryPlanCommand.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/VersionInfo.java
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/cache.properties
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/images/namespaces.gif
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/images/processinfo.gif
trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/images/showexecplan.gif
Property Changed:
----------------
trunk/sql12/plugins/cache/
Property changes on: trunk/sql12/plugins/cache
___________________________________________________________________
Added: svn:ignore
+ target
.settings
.project
.classpath
Deleted: trunk/sql12/plugins/cache/plugin_build.xml
===================================================================
--- trunk/sql12/plugins/cache/plugin_build.xml 2010-08-21 17:35:27 UTC (rev 5807)
+++ trunk/sql12/plugins/cache/plugin_build.xml 2010-08-21 17:36:13 UTC (rev 5808)
@@ -1,120 +0,0 @@
-<?xml version="1.0"?>
-<!--
- This is an Apache Ant build file to build the Cache plugin
- for distribution.
--->
-<project name="plugin-cache" default="build" basedir=".">
- <target name="init">
- <tstamp/>
- <property name="internal_name" value="cache"/>
- <property name="version" value="0.11"/>
-
- <property name="debug" value="on"/>
- <property name="optimize" value="off"/>
- <property name="deprecation" value="on"/>
- <property name="targetVM" value="1.6"/>
-
- <!-- adapt these lines to your need -->
- <!--
- <property name="p_plugin.work_dir" value="/home/gerd/work/java/squirrel1_2/squirrel-sql-dist/squirrel-sql/cache"/>
- <property name="p_plugin.core_libs_dir" value="/home/gerd/work/java/squirrel1_2/squirrel-sql-dist/squirrel-sql/core/dist/lib"/>
- <property name="p_plugin.dist_dir" value="/home/gerd/work/java/squirrel1_2/squirrel-sql-dist/squirrel-sql/core/dist/plugins"/>
- -->
- <echo message="---------------- ${internal_name} ${version} ----------------"/>
-
- <property environment="env"/>
- </target>
-
- <target name="initdirs" unless="p_plugin.work_dir">
- <property name="dist_dir" value="../../../squirrel-sql-dist/squirrel-sql"/>
- <property name="plugins_dist_dir" value="${dist_dir}/plugins"/>
- <property name="p_plugin.work_dir" value="${plugins_dist_dir}/${internal_name}/work"/>
- <property name="p_plugin.core_libs_dir" value="${dist_dir}/core/dist/lib"/>
- <property name="p_plugin.dist_dir" value="${dist_dir}/core/dist/plugins"/>
- </target>
-
-
- <!--
- ==================================================================
- Compile the plugin.
- No parameters.
- ==================================================================
- -->
- <target name="build" depends="init, initdirs">
- <property name="obj_dir" value="${p_plugin.work_dir}/obj"/>
-
- <mkdir dir="${obj_dir}"/>
-
-
- <javac srcdir="src"
- destdir="${obj_dir}"
- deprecation="${deprecation}"
- debug="${debug}"
- optimize="${optimize}"
- includeJavaRuntime="yes"
- source="${targetVM}"
- target="${targetVM}">
- <classpath>
- <fileset dir="lib">
- <include name="**/*.*"/>
- </fileset>
- <fileset dir="${p_plugin.core_libs_dir}">
- <include name="**/*.*"/>
- </fileset>
- </classpath>
- </javac>
- <copy todir="${obj_dir}" >
- <fileset dir="src" >
- <include name="**/*.gif"/>
- <include name="**/*.jpg"/>
- <include name="**/*.jpeg"/>
- <include name="**/*.xml"/>
- <include name="**/*.xsl"/>
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <jar jarfile="${p_plugin.dist_dir}/${internal_name}.jar" compress="false">
- <fileset dir="${obj_dir}">
- <include name="**/*.*"/>
- </fileset>
- </jar>
-
- <copy todir="${p_plugin.dist_dir}/${internal_name}" >
- <fileset dir="doc" >
- <include name="*.*"/>
- </fileset>
- </copy>
-
-
- <!--**********************************************************************-->
- <!-- What happens here sure is filthy because we copy plugin stuff to -->
- <!-- the core applications lib dir. It is necesary though since Cache -->
- <!-- uses the class loader.-->
-
-
- <copy todir="${p_plugin.core_libs_dir}" >
- <fileset dir="lib" >
- <include name="*.*"/>
- </fileset>
- </copy>
-
- <copy todir="${p_plugin.core_libs_dir}" >
- <fileset dir="${p_plugin.dist_dir}" >
- <include name="${internal_name}.jar"/>
- </fileset>
- </copy>
-
- <!-- -->
- <!--**********************************************************************-->
-
- <jar jarfile="${p_plugin.dist_dir}/${internal_name}/src.jar" compress="false">
- <fileset dir=".">
- <include name="src/**/*.*"/>
- <include name="plugin_build.xml"/>
- </fileset>
- </jar>
- </target>
-
-</project>
-
Added: trunk/sql12/plugins/cache/pom.xml
===================================================================
--- trunk/sql12/plugins/cache/pom.xml (rev 0)
+++ trunk/sql12/plugins/cache/pom.xml 2010-08-21 17:36:13 UTC (rev 5808)
@@ -0,0 +1,140 @@
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>squirrelsql-plugins-parent-pom</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </parent>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>cache</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Cache Plugin</name>
+ <description>Cache Plugin</description>
+ <inceptionYear>2001</inceptionYear>
+ <developers>
+ <developer>
+ <name>Gerd Wagner</name>
+ <roles>
+ <role>Administrator</role>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Rob Manning</name>
+ <roles>
+ <role>Developer</role>
+ <role>Release Manager</role>
+ </roles>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <url>http://www.squirrelsql.org/</url>
+ <scm>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection>
+ <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url>
+ </scm>
+ <issueManagement>
+ <system>SourceForge Tracker</system>
+ <url>http://sourceforge.net/tracker/?group_id=28383%26atid=393414</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Hudson</system>
+ <url>https://www.squirrel-sql.org/hudson/</url>
+ </ciManagement>
+ <dependencies>
+ <dependency>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>fw</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrel-sql</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrel-sql</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrelsql-test-utils</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
+ <artifactId>CacheDB</artifactId>
+ <version>2008.2.0.526.0</version>
+ </dependency>
+
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>${source-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire-plugin-version}</version>
+ <configuration>
+ <parallel>${surefire-parallel-type}</parallel>
+ <threadCount>${surefire-thread-count}</threadCount>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${jar-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${assembly-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>${findbugs-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>${pmd-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle-plugin-version}</version>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <!--
+ Since generating javadoc can be time-consuming, this is not done unless a "javadoc" profile is activated.
+ -->
+ <profile>
+ <id>javadoc</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadoc-plugin-version}</version>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
Deleted: trunk/sql12/plugins/cache/src/com/intersys/classes/SYSTEM/Process.java
===================================================================
--- trunk/sql12/plugins/cache/src/com/intersys/classes/SYSTEM/Process.java 2010-08-21 17:35:27 UTC (rev 5807)
+++ trunk/sql12/plugins/cache/src/com/intersys/classes/SYSTEM/Process.java 2010-08-21 17:36:13 UTC (rev 5808)
@@ -1,79 +0,0 @@
-package com.intersys.classes.SYSTEM;
-
-import com.intersys.classes.Persistent;
-import com.intersys.classes.RegisteredObject;
-import com.intersys.objects.Database;
-import com.intersys.objects.CacheException;
-import com.intersys.objects.Id;
-import com.intersys.cache.CacheObject;
-import com.intersys.cache.SysDatabase;
-import com.intersys.cache.Dataholder;
-
-
-public class Process extends Persistent
-{
- private static String CACHE_CLASS_NAME = "%SYSTEM.Process";
-
- /**
- * NB: DO NOT USE IN APPLICATION!
- * Use <code>Person._open</code> instead.
- * <p/>
- * Used to construct a Java object, corresponding to existing object
- * in Cache database.
- *
- * @see #_open(com.intersys.objects.Database, com.intersys.objects.Oid)
- * @see #_open(com.intersys.objects.Database, com.intersys.objects.Id)
- */
- public Process(CacheObject ref) throws CacheException
- {
- super(ref);
- }
-
- /**
- * Creates a new instance of object "<CacheClassName>" in Cache
- * database and corresponding object of class
- * <code>Person</code>.
- *
- * @param _db <code>Database</code> object used for connection with
- * Cache database.
- * @throws CacheException in case of error.
- * @see #_open(com.intersys.objects.Database, com.intersys.objects.Oid)
- * @see #_open(com.intersys.objects.Database, com.intersys.objects.Id)
- */
- public Process(Database db) throws CacheException
- {
- super(((SysDatabase) db).newCacheObject(CACHE_CLASS_NAME));
- }
-
- /**
- * Runs method <code> %OpenId </code> in Cache to open an object
- * from Cache database and creates corresponding object of class
- * <code>Person</code>.
- *
- * @param _db <code>Database</code> object used for connection with
- * Cache database.
- * @param id ID as specified in Cache represented as
- * <code>Id</code>.
- * @return <code> RegisteredObject </code>, corresponding to opened
- * object. This object may be of <code>Person</code> or of
- * any of its subclasses. Cast to <code>Person</code> is
- * guaranteed to pass without <code>ClassCastException</code> exception.
- * @throws CacheException in case of error.
- * @see java.lang.ClassCastException
- * @see #_open(com.intersys.objects.Database, com.intersys.objects.Oid)
- * @see #Person
- */
- public static RegisteredObject _open(Database db, Id id) throws CacheException
- {
- CacheObject cobj = (((SysDatabase) db).openCacheObject(CACHE_CLASS_NAME, id.toString()));
- return (RegisteredObject) (cobj.newJavaInstance());
- }
-
- public Dataholder terminate() throws CacheException
- {
- Dataholder[] args = new Dataholder[0];
- Dataholder res=mInternal.runInstanceMethod("Terminate",args,Database.RET_PRIM);
- return res;
-
- }
-}
Deleted: trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/CachePlugin.java
===================================================================
--- trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/CachePlugin.java 2010-08-21 17:35:27 UTC (rev 5807)
+++ trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/CachePlugin.java 2010-08-21 17:36:13 UTC (rev 5808)
@@ -1,247 +0,0 @@
-package de.ixdb.squirrel_sql.plugins.cache;
-
-import net.sourceforge.squirrel_sql.client.IApplication;
-import net.sourceforge.squirrel_sql.client.gui.session.SQLInternalFrame;
-import net.sourceforge.squirrel_sql.client.gui.session.ObjectTreeInternalFrame;
-import net.sourceforge.squirrel_sql.client.action.ActionCollection;
-import net.sourceforge.squirrel_sql.client.plugin.*;
-import net.sourceforge.squirrel_sql.client.preferences.IGlobalPreferencesPanel;
-import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
-import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
-import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
-import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
-import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * The SQL Script plugin class.
- */
-public class CachePlugin extends DefaultSessionPlugin
-{
-
- /** Logger for this class. */
- private static ILogger s_log = LoggerController.createLogger(CachePlugin.class);
-
- /** The app folder for this plugin. */
- private File _pluginAppFolder;
-
- private PluginResources _resources;
-
- /** Folder to store user settings in. */
- private File _userSettingsFolder;
-
- /**
- * Return the internal name of this plugin.
- *
- * @return the internal name of this plugin.
- */
- public String getInternalName()
- {
- return "cache";
- }
-
- /**
- * Return the descriptive name of this plugin.
- *
- * @return the descriptive name of this plugin.
- */
- public String getDescriptiveName()
- {
- return "Plugin for the Intersystems Cache DB";
- }
-
- /**
- * Returns the current version of this plugin.
- *
- * @return the current version of this plugin.
- */
- public String getVersion()
- {
- return "0.01";
- }
-
- /**
- * Returns the authors name.
- *
- * @return the authors name.
- */
- public String getAuthor()
- {
- return "Gerd Wagner";
- }
-
- /**
- * Returns the name of the change log for the plugin. This should
- * be a text or HTML file residing in the <TT>getPluginAppSettingsFolder</TT>
- * directory.
- *
- * @return the changelog file name or <TT>null</TT> if plugin doesn't have
- * a change log.
- */
- public String getChangeLogFileName()
- {
- return "changes.txt";
- }
-
- /**
- * Returns the name of the Help file for the plugin. This should
- * be a text or HTML file residing in the <TT>getPluginAppSettingsFolder</TT>
- * directory.
- *
- * @return the Help file name or <TT>null</TT> if plugin doesn't have
- * a help file.
- */
- public String getHelpFileName()
- {
- return "readme.txt";
- }
-
- /**
- * Returns the name of the Licence file for the plugin. This should
- * be a text or HTML file residing in the <TT>getPluginAppSettingsFolder</TT>
- * directory.
- *
- * @return the Licence file name or <TT>null</TT> if plugin doesn't have
- * a licence file.
- */
- public String getLicenceFileName()
- {
- return "licence.txt";
- }
-
- /**
- * @return Comma separated list of contributors.
- */
- public String getContributors()
- {
- return "Andreas Schneider";
- }
-
- /**
- * Create preferences panel for the Global Preferences dialog.
- *
- * @return Preferences panel.
- */
- public IGlobalPreferencesPanel[] getGlobalPreferencePanels()
- {
- return new IGlobalPreferencesPanel[0];
- }
-
- /**
- * Initialize this plugin.
- */
- public synchronized void initialize() throws PluginException
- {
- super.initialize();
- IApplication app = getApplication();
-
-
- // Folder within plugins folder that belongs to this
- // plugin.
- try
- {
- _pluginAppFolder = getPluginAppSettingsFolder();
- }
- catch (IOException ex)
- {
- throw new PluginException(ex);
- }
-
- // Folder to store user settings.
- try
- {
- _userSettingsFolder = getPluginUserSettingsFolder();
- }
- catch (IOException ex)
- {
- throw new PluginException(ex);
- }
-
- _resources = new CachePluginResources("de.ixdb.squirrel_sql.plugins.cache.cache", this);
-
- // Load plugin preferences.
- ActionCollection coll = app.getActionCollection();
- coll.add(new ScriptViewAction(app, _resources, this));
- coll.add(new ScriptFunctionAction(app, _resources, this));
- coll.add(new ScriptCdlAction(app, _resources, this));
- coll.add(new ShowNamespacesAction(app, _resources, this));
- coll.add(new ShowQueryPlanAction(app, _resources, this));
- coll.add(new ShowProcessesAction(app, _resources, this));
-
-// coll.add(new ScriptProcedureAction(app, _resources, this, _userSettingsFolder));
-// coll.add(new RefreshRepositoryAction(app, _resources, this, _userSettingsFolder));
- }
-
- /**
- * Application is shutting down so save data.
- */
- public void unload()
- {
- super.unload();
- }
-
- /**
- * Called when a session started. Add commands to popup menu
- * in object tree.
- *
- * @param session The session that is starting.
- *
- * @return <TT>true</TT> to indicate that this plugin is
- * applicable to passed session.
- */
- public PluginSessionCallback sessionStarted(ISession session)
- {
- try
- {
- if(-1 != session.getSQLConnection().getConnection().getMetaData().getDriverName().toUpperCase().indexOf("CACHE"))
- {
- ActionCollection coll = getApplication().getActionCollection();
- IObjectTreeAPI otApi = session.getSessionInternalFrame().getObjectTreeAPI();
- otApi.addToPopup(DatabaseObjectType.VIEW, coll.get(ScriptViewAction.class));
- otApi.addToPopup(DatabaseObjectType.SESSION, coll.get(ShowNamespacesAction.class));
- otApi.addToPopup(DatabaseObjectType.SESSION, coll.get(ShowProcessesAction.class));
- otApi.addToPopup(DatabaseObjectType.PROCEDURE, coll.get(ScriptFunctionAction.class));
- otApi.addToPopup(DatabaseObjectType.PROCEDURE, coll.get(ScriptCdlAction.class));
- otApi.addToPopup(DatabaseObjectType.TABLE, coll.get(ScriptCdlAction.class));
- otApi.addToPopup(DatabaseObjectType.VIEW, coll.get(ScriptCdlAction.class));
-
-
- ISQLPanelAPI sqlApi = session.getSessionInternalFrame().getSQLPanelAPI();
- sqlApi.addToSQLEntryAreaMenu(coll.get(ShowQueryPlanAction.class));
-
- session.addSeparatorToToolbar();
- session.addToToolbar(coll.get(ShowNamespacesAction.class));
- session.addToToolbar(coll.get(ShowProcessesAction.class));
- session.addToToolbar(coll.get(ShowQueryPlanAction.class));
- session.getSessionInternalFrame().addToToolsPopUp("cachequeryplan", coll.get(ShowQueryPlanAction.class));
-
-
- return new PluginSessionCallback()
- {
- public void sqlInternalFrameOpened(SQLInternalFrame sqlInternalFrame, ISession sess)
- {
- //plugin supports only Session main window
- }
-
- public void objectTreeInternalFrameOpened(ObjectTreeInternalFrame objectTreeInternalFrame, ISession sess)
- {
- //plugin supports only Session main window
- }
- };
- }
- else
- {
- return null;
- }
- }
- catch(Exception e)
- {
- s_log.error("Could not get driver name", e);
- return null;
- }
- }
-
-}
Deleted: trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/CachePluginResources.java
===================================================================
--- trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/CachePluginResources.java 2010-08-21 17:35:27 UTC (rev 5807)
+++ trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/CachePluginResources.java 2010-08-21 17:36:13 UTC (rev 5808)
@@ -1,13 +0,0 @@
-package de.ixdb.squirrel_sql.plugins.cache;
-
-import net.sourceforge.squirrel_sql.client.plugin.IPlugin;
-import net.sourceforge.squirrel_sql.client.plugin.PluginResources;
-
-public final class CachePluginResources extends PluginResources
-{
- CachePluginResources(String rsrcBundleBaseName, IPlugin plugin)
- {
- super(rsrcBundleBaseName, plugin);
- }
-}
-
Deleted: trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/CdlAccessor.java
===================================================================
--- trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/CdlAccessor.java 2010-08-21 17:35:27 UTC (rev 5807)
+++ trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/CdlAccessor.java 2010-08-21 17:36:13 UTC (rev 5808)
@@ -1,185 +0,0 @@
-package de.ixdb.squirrel_sql.plugins.cache;
-
-import org.xml.sax.InputSource;
-import org.w3c.dom.Document;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.DocumentBuilder;
-import java.lang.reflect.Method;
-import java.io.InputStream;
-import java.io.ByteArrayInputStream;
-import java.sql.Statement;
-import java.sql.Connection;
-
-import com.intersys.cache.Dataholder;
-import com.intersys.cache.CacheObject;
-import com.intersys.objects.Database;
-import com.intersys.objects.CacheDatabase;
-import com.intersys.objects.CacheException;
-import com.intersys.objects.CacheReader;
-import com.intersys.classes.CharacterStream;
-import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
-import net.sourceforge.squirrel_sql.fw.sql.IProcedureInfo;
-
-public class CdlAccessor
-{
- static org.w3c.dom.Document getDocument(InputStream istream)
- {
- try
- {
- InputSource is = new InputSource(istream);
-
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setValidating(false);
- dbf.setIgnoringElementContentWhitespace(true);
-
- dbf.setNamespaceAware(true);
- DocumentBuilder db = dbf.newDocumentBuilder();
- return db.parse(is);
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- }
-
-
- static String getDefinition(String list, Connection con)
- {
- try
- {
- Dataholder[] argv = new Dataholder[1];
- argv[0] = Dataholder.create(list);
-
- Database conn = CacheDatabase.getDatabase(con);
-
- Dataholder res;
-
- try
- {
- res = conn.runClassMethod("CM.methgetClassDefinition", "getClassDefinition", argv, Database.RET_OBJECT);
- }
- catch (CacheException e)
- {
- Statement stat = con.createStatement();
- stat.executeUpdate
- (
-
- "CREATE METHOD CM.getClassDefinition(IN className %String)\n" +
- "RETURNS Integer\n" +
- "PROCEDURE\n" +
- "LANGUAGE COS\n" +
- "{\n" +
- " new id,oref,oFile,file\n" +
- " if $F($ZV,\"Linux\") \n" +
- " set file = \"$HOME/CacheTemp\"_$job_\".xml\"\n" +
- " else \n" +
- " set file = \"c:\\\\temp\\\\$CacheTemp\"_$job_\".xml\" \n" +
- " do $SYSTEM.OBJ.ExportCDL(className ,file, \"-d\")\n" +
- " set oFile = ##class(%FileBinaryStream).%New()\n" +
- " do oFile.LinkToFile(file)\n" +
- "\n" +
- " set outStream = ##class(%GlobalCharacterStream).%New()\n" +
- " do outStream.CopyFrom(oFile)\n" +
- " quit outStream\n" +
- "}"
- );
- stat.close();
-
- res = conn.runClassMethod("CM.methgetClassDefinition", "getClassDefinition", argv, Database.RET_OBJECT);
- }
-
-
- CacheObject cobj = res.getCacheObject();
- CharacterStream characterStream = (CharacterStream) (cobj.newJavaInstance());
-
- CacheReader reader = characterStream.getReader();
-
- StringBuffer sb = new StringBuffer();
- sb.append("");
-
-
- char[] buf = new char[50];
- int count = reader.read(buf);
- while(true)
- {
-
- for (int i = 0; i < count; i++)
- {
- sb.append(buf[i]);
- }
-
- if(count < 50)
- {
- break;
- }
-
- count = reader.read(buf);
- }
- return sb.toString();
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- }
-
-
- static org.w3c.dom.Document getDefinitionAsXmlDoc(String list, Connection connection)
- {
- String cdl = getDefinition(list, connection);
-
- ByteArrayInputStream bis = new ByteArrayInputStream(cdl.getBytes());
-
- return getDocument(bis);
- }
-
-
- static String getSearchStringForCdlAccess(IDatabaseObjectInfo[] dbObjs)
- {
- String ret = null;
-
- for (int i = 0; i < dbObjs.length; i++)
- {
- String prefix = "User.";
-
- if(false == "SQLUser".equalsIgnoreCase(dbObjs[i].getSchemaName()))
- {
- prefix = dbObjs[i].getSchemaName() + ".";
- }
-
-
-
- if (dbObjs[i] instanceof IProcedureInfo)
- {
- IProcedureInfo pi = (IProcedureInfo) dbObjs[i];
-
- if (null == ret)
- {
- ret = prefix + "func" + pi.getSimpleName();
- ret += "," + prefix + "meth" + pi.getSimpleName();
-
- }
- else
- {
- ret += "," + prefix + "func" + pi.getSimpleName();
- ret += "," + prefix + "meth" + pi.getSimpleName();
- }
- }
- else
- {
- if (null == ret)
- {
- ret = prefix + dbObjs[i].getSimpleName();
- }
- else
- {
- ret += "," + prefix + dbObjs[i].getSimpleName();
- }
- }
-
- }
- return ret;
- }
-
-}
Deleted: trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/I18NStrings.properties
===================================================================
--- trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/I18NStrings.properties 2010-08-21 17:35:27 UTC (rev 5807)
+++ trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/I18NStrings.properties 2010-08-21 17:36:13 UTC (rev 5808)
@@ -1 +0,0 @@
-cache.VersionInfo.unsupported=This function is not supported in Cache Version higher than 5
\ No newline at end of file
Deleted: trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/NamespaceCtrl.java
===================================================================
--- trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/NamespaceCtrl.java 2010-08-21 17:35:27 UTC (rev 5807)
+++ trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/NamespaceCtrl.java 2010-08-21 17:36:13 UTC (rev 5808)
@@ -1,143 +0,0 @@
-package de.ixdb.squirrel_sql.plugins.cache;
-
-import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
-import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.client.session.event.ISessionListener;
-import net.sourceforge.squirrel_sql.client.session.event.SessionEvent;
-import net.sourceforge.squirrel_sql.client.session.event.SessionAdapter;
-
-import javax.swing.*;
-import javax.swing.table.DefaultTableModel;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.prefs.Preferences;
-import java.util.Vector;
-import java.util.Arrays;
-
-
-public class NamespaceCtrl
-{
- private NamespaceDlg _dlg;
- private NamespaceCtrlListener _namespaceCtrlListener;
- private ISession _session;
-
- private String[] _cols = new String[]{"Namespace", "Associated aliases"};
-
- private static final String PREFS_KEY_ALIAS_NAME_TEMPLATE = "Squirrel.ixdb.aliasNameTemplate";
- private static final String ALIAS_NAME_TEMPLATE_DEFAULT = "Cache %server %namespace";
-
-
- public NamespaceCtrl(ISession session, String[][] nameSpacesAndAliases, NamespaceCtrlListener namespaceCtrlListener)
- {
- _session = session;
-
- _session.getApplication().getSessionManager().addSessionListener(new SessionAdapter()
- {
- public void sessionClosed(SessionEvent evt)
- {
- _dlg.setVisible(false);
- _dlg.dispose();
- }
- });
-
- _namespaceCtrlListener = namespaceCtrlListener;
- _dlg = new NamespaceDlg(session.getApplication().getMainFrame());
-
- DefaultTableModel dtm =
- new DefaultTableModel()
- {
- public boolean isCellEditable(int row, int column)
- {
- return false;
- }
- };
-
- dtm.setDataVector(nameSpacesAndAliases, _cols);
-
- _dlg.tblNamespaces.setModel(dtm);
-
- _dlg.tblNamespaces.addMouseListener(new MouseAdapter()
- {
- public void mouseClicked(MouseEvent e)
- {
- onMouseClicked(e);
- }
-
- });
-
- String aliasNameTemplate = Preferences.userRoot().get(PREFS_KEY_ALIAS_NAME_TEMPLATE, ALIAS_NAME_TEMPLATE_DEFAULT);
-
- _dlg.txtAliasNameTemplate.setText(aliasNameTemplate);
-
- _dlg.setSize(400, 400);
-
- GUIUtils.centerWithinParent(_dlg);
-
- _dlg.setVisible(true);
-
-
- }
-
- private void onMouseClicked(MouseEvent e)
- {
- if(1 < e.getClickCount())
- {
- int selRow =_dlg.tblNamespaces.getSelectedRow();
-
- if(-1 == selRow)
- {
- return;
- }
-
- DefaultTableModel dtm =(DefaultTableModel) _dlg.tblNamespaces.getModel();
-
- Vector dataVector = dtm.getDataVector();
-
- Vector rowVector = (Vector) dataVector.get(selRow);
- String[] selNamespaceAndAlias = (String[]) rowVector.toArray(new String[rowVector.size()]);
-
- if(0 < selNamespaceAndAlias[1].length())
- {
- String msg =
- "The selected namespace already has one or more aliases.\n" +
- "Do you want to create another alias for the selected namespace?.";
-
- if(JOptionPane.YES_OPTION != JOptionPane.showConfirmDialog(_dlg, msg, "Duplicate alias", JOptionPane.YES_NO_CANCEL_OPTION))
- {
- return;
- }
- }
-
- String aliasNameTemplate = _dlg.txtAliasNameTemplate.getText();
-
- if(null == aliasNameTemplate || 0 == aliasNameTemplate.trim().length())
- {
- aliasNameTemplate = ALIAS_NAME_TEMPLATE_DEFAULT;
- }
-
- Preferences.userRoot().put(PREFS_KEY_ALIAS_NAME_TEMPLATE, aliasNameTemplate);
-
-
- String newAliasName = _namespaceCtrlListener.nameSpaceSelected(_session, selNamespaceAndAlias[0], aliasNameTemplate);
-
- if(0 == selNamespaceAndAlias[1].length())
- {
- selNamespaceAndAlias[1] = newAliasName;
- }
- else
- {
- selNamespaceAndAlias[1] += ";" + newAliasName;
- }
-
- rowVector.remove(1);
- rowVector.add(selNamespaceAndAlias[1]);
-
- Vector colsVector = new Vector(Arrays.asList(_cols));
- dtm.setDataVector(dataVector, colsVector);
-
-
- _dlg.tblNamespaces.getSelectionModel().setSelectionInterval(selRow, selRow);
- }
- }
-
-}
Deleted: trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/NamespaceCtrlListener.java
===================================================================
--- trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/NamespaceCtrlListener.java 2010-08-21 17:35:27 UTC (rev 5807)
+++ trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/NamespaceCtrlListener.java 2010-08-21 17:36:13 UTC (rev 5808)
@@ -1,9 +0,0 @@
-package de.ixdb.squirrel_sql.plugins.cache;
-
-import net.sourceforge.squirrel_sql.client.session.ISession;
-
-
-public interface NamespaceCtrlListener
-{
- String nameSpaceSelected(ISession session, String nameSpace, String aliasNameTemplate);
-}
Deleted: trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/NamespaceDlg.java
===================================================================
--- trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/NamespaceDlg.java 2010-08-21 17:35:27 UTC (rev 5807)
+++ trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/NamespaceDlg.java 2010-08-21 17:36:13 UTC (rev 5808)
@@ -1,43 +0,0 @@
-package de.ixdb.squirrel_sql.plugins.cache;
-
-import javax.swing.*;
-import java.awt.*;
-
-
-public class NamespaceDlg extends JDialog
-{
- JTextField txtAliasNameTemplate;
- JTable tblNamespaces;
-
- public NamespaceDlg(JFrame mainFrame)
- {
- super(mainFrame, "Create alias for namespace");
-
- getContentPane().setLayout(new BorderLayout(0,3));
-
- JPanel pnlContent = new JPanel(new BorderLayout(0,5));
-
-
-
- pnlContent.add(new JLabel("Double click namespace to create alias"), BorderLayout.NORTH);
-
- tblNamespaces = new JTable();
- tblNamespaces.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-
- pnlContent.add(new JScrollPane(tblNamespaces), BorderLayout.CENTER);
-
- JPanel pnlBottom = new JPanel(new GridLayout(4,1));
- pnlBottom.add(new JLabel("Edit alias name template:"));
- pnlBottom.add(new JLabel("%server will be replaced by server name"));
- pnlBottom.add(new JLabel("%namespace will be replaced by namespace name"));
-
- txtAliasNameTemplate = new JTextField();
- pnlBottom.add(txtAliasNameTemplate);
- pnlContent.add(pnlBottom, BorderLayout.SOUTH);
-
-
- getContentPane().add(new JPanel(), BorderLayout.NORTH);
- getContentPane().add(pnlContent, BorderLayout.CENTER);
-
- }
-}
Deleted: trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ProcessData.java
===================================================================
--- trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ProcessData.java 2010-08-21 17:35:27 UTC (rev 5807)
+++ trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ProcessData.java 2010-08-21 17:36:13 UTC (rev 5808)
@@ -1,257 +0,0 @@
-package de.ixdb.squirrel_sql.plugins.cache;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.ArrayList;
-
-
-public class ProcessData
-{
- public int pid;
- public Integer blockedByPid;
- public String deadLockChain;
- public int lockCount;
- public String locks;
- public String nspace;
- public String routine;
- public long lines;
- public long globals;
- public String state;
- public String userName;
- public String clientName;
- public String exeName;
- public String ipAdress;
- public String device;
- public int job;
-
-
- public static String[] getColumns()
- {
- return new String[]
- {
- "Pid",
- "Blocked by Pid",
- "Deadlock chain (Pids)",
- "Lock count",
- "Locks",
- "Nspace",
- "Routine",
- "Lines",
- "Globals",
- "State",
- "Username",
- "Client Name",
- "EXE Name",
- "IP Address",
- "Device",
- "Job#"
- };
- }
-
-
-
- private ProcessData blockedBy;
-
- public ProcessData(ResultSet procList)
- {
- try
- {
- job = procList.getInt("Job#");
- pid = procList.getInt("Pid");
- device = procList.getString("Device");
- nspace = procList.getString("Nspace");
- routine = procList.getString("Routine");
- lines = procList.getLong("Lines");
- globals =procList.getLong("Globals");
- state = procList.getString("State");
- userName = procList.getString("Username");
- clientName = procList.getString("Client Name");
- exeName = procList.getString("EXE Name");
- ipAdress = procList.getString("IP Address");
- }
- catch (SQLException e)
- {
- throw new RuntimeException(e);
- }
-
-
- }
-
-
- public void fillBlocks(ProcessData[] allProcData)
- {
- int[] blockedPids = parseBlockedPidsFromLocks();
-
- for (int i = 0; i < allProcData.length; i++)
- {
- for (int j = 0; j < blockedPids.length; j++)
- {
- if(blockedPids[j] == allProcData[i].pid)
- {
- allProcData[i].blockedBy = this;
- allProcData[i].blockedByPid = new Integer(this.pid);
- }
- }
- }
- }
-
- private int[] parseBlockedPidsFromLocks()
- {
- // pid 25493, lock examples:
- // 5 [" /db1/shd_data_4_3/"]User.ygwaBvbPosKorrD(1) 25493 1D, 25499 X E
- // 5 [" /db1/shd_data_4_3/"]User.ygwaBvbPosKorrD(1) 25493 1D, 25499,25506 X,X E,E
- // 5 [" /db1/shd_data_4_3/"]User.ygwaBvbPosKorrD(1) 25493 1D, 25499,25506,25508 X,X,X E,E,E
- //
- // oder
- //
- //6 [" d:\db\shd_data_lov\"]User.WLagerartikelD(76) 5544 1D,
- //7 [" d:\db\shd_data_lov\"]User.WLagerartikelD(77) 5544 1D, 3804 S E
- //8 [" d:\db\shd_data_lov\"]User.WVorgangD(24) 5544 1D,
- //
- // oder fuer kein Lock:
- //
- //3 [" f:\db\shd_data\"]User.ygwaTestD(989) 3792 1D,
- //4 [" f:\db\shd_data\"]User.ygwaTestD(990) 3792 1D,
- //5 [" f:\db\shd_data\"]User.ygwaTestD(991) 3792 1D,
- //6 [" f:\db\shd_data\"]User.ygwaTestD(992) 3792 1D,
- //7 [" f:\db\shd_data\"]User.ygwaTestD(993) 3792 1D,
- //8 [" f:\db\shd_data\"]User.ygwaTestD(994) 3792 1D,
- //9 [" f:\db\shd_data\"]User.ygwaTestD(995) 3792 1D,
- //
- //
-
-
- if(null == locks)
- {
- return new int[0];
- }
-
- HashMap blockedPids = new HashMap();
- String[] splits = locks.split("\n");
-
-
-
-
- for (int i = 0; i < splits.length; i++)
- {
- String[] splits2 = splits[i].split(",");
-
- if(2 > splits2.length)
- {
- continue;
- }
-
- for (int j = 1; j < splits2.length; j++)
- {
- String[] splits3 = splits2[j].replaceAll("\t", " ").split(" ");
-
- for (int k = 0; k < splits3.length; k++)
- {
- String[] splits4 = splits3[k].split(",");
-
- for (int l = 0; l < splits4.length; l++)
- {
- try
- {
- Integer pidBuf = new Integer(splits4[l].trim());
-
- // Es mach nichts, wenn es die PID nicht g�be.
- // Sie wird dann einfach oben nicht zugeordnet.
- if(pidBuf.intValue() != pid)
- {
- blockedPids.put(pidBuf, pidBuf);
- }
- }
- catch (NumberFormatException e)
- {
- }
- }
-
- }
- }
-
-
- }
-
- Integer[] blockedPidsBuf = (Integer[]) blockedPids.keySet().toArray(new Integer[0]);
-
- int[] ret = new int[blockedPidsBuf.length];
-
- for (int i = 0; i < ret.length; i++)
- {
- ret[i] = blockedPidsBuf[i].intValue();
- }
-
- return ret;
- }
-
- public void fillDeadLockChain()
- {
-
- ProcessData blocker = blockedBy;
-
-
- ArrayList chain = new ArrayList();
-
- HashMap blockers = new HashMap();
-
- while(null != blocker)
- {
- chain.add(new Integer(blocker.pid));
-
- if(blocker.pid == pid)
- {
- deadLockChain = getChainAsSting(chain);
- break;
- }
-
- if(null != blockers.get(blocker))
- {
- // If we are blocked by a member of a deadlock chain
- // but do not belong to the deadlock chain ourselves
- // this prevents a forever loop.
- break;
- }
-
- blockers.put(blocker, blocker);
- blocker = blocker.blockedBy;
- }
- }
-
- private String getChainAsSting(ArrayList chain)
- {
- ///////////////////////////////////////////////////////////////////////////////
- // A deadlock chain is circular and does not have a defined beginning Pid.
- // In order to make the string representation of a deadlock chain unique
- // we put the smallest Pid at the beginning of the chain.
- Integer minPid = (Integer)chain.get(0);
- int ixOfMinPid = 0;
-
- for (int i = 0; i < chain.size(); i++)
- {
- Integer buf = ((Integer) chain.get(i));
- if(minPid.intValue() > buf.intValue())
- {
- minPid = buf;
- ixOfMinPid = i;
- }
- }
-
- for(int i =0; i < ixOfMinPid; ++i)
- {
- chain.add(chain.remove(0));
- }
- //
- /////////////////////////////////////////////////////////////////////////////
-
- String ret = "" + chain.get(0);
- for (int i = 1; i < chain.size(); i++)
- {
- ret += "-->" + chain.get(i);
- }
- ret += "-->" + chain.get(0);
-
- return ret;
- }
-}
Deleted: trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ProcessListPanel.java
===================================================================
--- trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ProcessListPanel.java 2010-08-21 17:35:27 UTC (rev 5807)
+++ trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ProcessListPanel.java 2010-08-21 17:36:13 UTC (rev 5808)
@@ -1,53 +0,0 @@
-package de.ixdb.squirrel_sql.plugins.cache;
-
-import net.sourceforge.squirrel_sql.fw.gui.SortableTable;
-import net.sourceforge.squirrel_sql.fw.gui.SortableTableModel;
-
-import javax.swing.*;
-import javax.swing.table.DefaultTableModel;
-import java.awt.*;
-
-public class ProcessListPanel extends JPanel
-{
- SortableTable tblProcessList;
- JButton btnRefresh;
- JButton btnTerminate;
- JButton btnClose;
-
- public ProcessListPanel()
- {
- setLayout(new BorderLayout());
-
-
- tblProcessList = new SortableTable(new SortableTableModel(null));
- tblProcessList.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
- tblProcessList.getTableHeader().setResizingAllowed(true);
- tblProcessList.getTableHeader().setReorderingAllowed(true);
- tblProcessList.setAutoCreateColumnsFromModel(false);
- tblProcessList.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
-
- add(new JScrollPane(tblProcessList), BorderLayout.CENTER);
-
-
-
- JPanel pnlSouth = new JPanel();
- pnlSouth.setLayout(new GridBagLayout());
- GridBagConstraints gbc;
-
- btnRefresh = new JButton("Refresh list");
- btnTerminate = new JButton("Terminate selected Process");
- btnClose = new JButton("Close processes tab");
-
- gbc = new GridBagConstraints(0,0,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,5,0,5), 0,0);
- pnlSouth.add(btnRefresh, gbc);
-
- gbc = new GridBagConstraints(1,0,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,0,0,5), 0,0);
- pnlSouth.add(btnTerminate, gbc);
-
- gbc = new GridBagConstraints(2,0,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,0,0,5), 0,0);
- pnlSouth.add(btnClose,gbc);
-
- add(pnlSouth, BorderLayout.SOUTH);
- }
-
-}
Deleted: trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ProcessListTab.java
===================================================================
--- trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ProcessListTab.java 2010-08-21 17:35:27 UTC (rev 5807)
+++ trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ProcessListTab.java 2010-08-21 17:36:13 UTC (rev 5808)
@@ -1,277 +0,0 @@
-package de.ixdb.squirrel_sql.plugins.cache;
-
-import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.client.session.mainpanel.IMainPanelTab;
-import net.sourceforge.squirrel_sql.fw.gui.ButtonTableHeader;
-import net.sourceforge.squirrel_sql.fw.gui.SortableTableModel;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetViewerTablePanel;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.CellDataPopup;
-
-import javax.swing.*;
-import javax.swing.table.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-
-
-public class ProcessListTab implements IMainPanelTab
-{
- ProcessListPanel _pnlProcessList;
- private ISession _session;
- private ProcessData[] _procData;
- private ProcessListTabListener _processListTabListener;
-
- public ProcessListTab(ProcessData[] procData, ProcessListTabListener processListTabListener)
- {
- _procData = procData;
-
-
- _processListTabListener = processListTabListener;
- _pnlProcessList = new ProcessListPanel();
-
- DefaultTableModel dtm =
- new DefaultTableModel()
- {
- public boolean isCellEditable(int row, int column)
- {
- return false;
- }
-
- public Object getValueAt(int row, int column)
- {
- return onGetValueAt(row, column);
- }
-
- public String getColumnName(int column)
- {
- return ProcessData.getColumns()[column];
- }
-
- public int getRowCount()
- {
- if(null == ProcessListTab.this)
- {
- // I have seen the reference to the outer class being null
- // when this method is called.
- // I have seen it only with the runtime jars
- // and on Linux.
- // I could not reproduce in my IDE.
- return 0;
- }
- else
- {
- return ProcessListTab.this._procData.length;
- }
- }
-
- public int getColumnCount()
- {
- return ProcessData.getColumns().length;
- }
-
- };
-
- SortableTableModel stm = (SortableTableModel) _pnlProcessList.tblProcessList.getModel();
- stm.setActualModel(dtm);
-
- DefaultTableCellRenderer dtcr =
- new DefaultTableCellRenderer()
- {
- public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column)
- {
- Component rend = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
- if(null != value && 0 < value.toString().indexOf('\n'))
- {
- rend.setBackground(Color.cyan);
- }
- else
- {
- if (isSelected)
- {
- setBackground(table.getSelectionBackground());
- }
- else
- {
- setBackground(table.getBackground());
- }
- }
- return rend;
- }
- };
-
-
- final TableColumnModel tcm = new DefaultTableColumnModel();
- for (int i = 0; i < ProcessData.getColumns().length; ++i)
- {
- final TableColumn col = new TableColumn(i);
- col.setHeaderValue(ProcessData.getColumns()[i]);
- col.setCellRenderer(dtcr);
- tcm.addColumn(col);
- }
-
-
- _pnlProcessList.tblProcessList.setColumnModel(tcm);
-
-
- _pnlProcessList.btnRefresh.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- onRefresh();
- }
- });
-
- _pnlProcessList.btnTerminate.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- onTerminate();
- }
- });
-
- _pnlProcessList.btnClose.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- onClose();
- }
- });
-
-
- _pnlProcessList.tblProcessList.addMouseListener(new MouseAdapter()
- {
- public void mousePressed(MouseEvent evt)
- {
- if (evt.getClickCount() == 2)
- {
- // figure out which column the user clicked on
- // so we can pass in the right column description
-
- Point pt = evt.getPoint();
- int col = _pnlProcessList.tblProcessList.columnAtPoint(pt);
- ColumnDisplayDefinition dumDef = new ColumnDisplayDefinition(50, "Detail");
- CellDataPopup.showDialog(_pnlProcessList.tblProcessList, dumDef, evt,false);
- }
- }
- });
- }
-
-
- private void onClose()
- {
- _processListTabListener.closeRequested(_session);
- }
-
- private void onTerminate()
- {
- int selectedRow = _pnlProcessList.tblProcessList.getSelectedRow();
- selectedRow = _pnlProcessList.tblProcessList.getSortableTableModel().transfromToModelRow(selectedRow);
-
- String msg;
- if(-1 == selectedRow)
- {
- msg = "No process selected.\nPlease select the Process you wish to terminate.";
- JOptionPane.showMessageDialog(_session.getApplication().getMainFrame(), msg);
- return;
- }
-
- msg = "Do you really wish to terminate the selected process?";
- if(JOptionPane.YES_OPTION != JOptionPane.showConfirmDialog(_session.getApplication().getMainFrame(), msg, "Terminate process", JOptionPane.YES_NO_CANCEL_OPTION))
- {
- return;
- }
-
- int termRet = _processListTabListener.terminateRequested(_session, _procData[selectedRow]);
-
- if(1 != termRet)
- {
- msg = "Terminate should return 1 but returned " + termRet + ".\nMaybe terminate didn't succeed.";
- JOptionPane.showMessageDialog(_session.getApplication().getMainFrame(), msg);
- return;
- }
- }
-
- private void onRefresh()
- {
- int selectedRow = _pnlProcessList.tblProcessList.getSelectedRow();
-
- ProcessData old = null;
- if(-1 != selectedRow)
- {
- old = _procData[selectedRow];
- }
-
- _procData = _processListTabListener.refreshRequested(_session);
-
- SortableTableModel stm = (SortableTableModel) _pnlProcessList.tblProcessList.getModel();
- ((DefaultTableModel)stm.getActualModel()).fireTableDataChanged();
- stm.fireTableDataChanged();
-
- ButtonTableHeader bth = (ButtonTableHeader) _pnlProcessList.tblProcessList.getTableHeader();
-
- if(-1 != bth.getCurrentlySortedColumnIdx())
- {
- stm.sortByColumn(bth.getCurrentlySortedColumnIdx(), bth.isAscending());
- }
-
-
- _pnlProcessList.tblProcessList.repaint();
-
- if(null != old)
- {
- for (int i = 0; i < _procData.length; i++)...
[truncated message content] |
|
From: <man...@us...> - 2010-08-21 17:35:37
|
Revision: 5807
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5807&view=rev
Author: manningr
Date: 2010-08-21 17:35:27 +0000 (Sat, 21 Aug 2010)
Log Message:
-----------
Initial changes to convert from Ant build to Maven build
Added Paths:
-----------
trunk/sql12/plugins/codecompletion/pom.xml
trunk/sql12/plugins/codecompletion/src/main/
trunk/sql12/plugins/codecompletion/src/main/java/
trunk/sql12/plugins/codecompletion/src/main/java/net/
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/AutoCorrectProvider.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionAutoCorrectInfo.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionCatalogInfo.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionColumnInfo.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionFunctionInfo.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfo.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfoCollection.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionKeywordInfo.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionPlugin.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionSchemaInfo.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionStoredProcedureInfo.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableAliasInfo.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableInfo.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTypeInfo.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletorModel.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CompleteCodeAction.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CompletionFunctionsModel.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/Resources.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/StandardCompletorModel.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/completionfunctions/
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/completionfunctions/AbstractJoin.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/completionfunctions/CodeCompletionFunction.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/completionfunctions/GenericCodeCompletionInfo.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/completionfunctions/InnerJoin.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/completionfunctions/Join.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/completionfunctions/LeftJoin.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/completionfunctions/RightJoin.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/completionfunctions/TestCompletionFunction.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferences.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferencesController.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferencesPanel.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/ConfigCboItem.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/PrefixedConfig.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/PrefixesTableModel.java
trunk/sql12/plugins/codecompletion/src/main/resources/
trunk/sql12/plugins/codecompletion/src/main/resources/doc/
trunk/sql12/plugins/codecompletion/src/main/resources/net/
trunk/sql12/plugins/codecompletion/src/main/resources/net/sourceforge/
trunk/sql12/plugins/codecompletion/src/main/resources/net/sourceforge/squirrel_sql/
trunk/sql12/plugins/codecompletion/src/main/resources/net/sourceforge/squirrel_sql/plugins/
trunk/sql12/plugins/codecompletion/src/main/resources/net/sourceforge/squirrel_sql/plugins/codecompletion/
trunk/sql12/plugins/codecompletion/src/main/resources/net/sourceforge/squirrel_sql/plugins/codecompletion/I18NStrings.properties
trunk/sql12/plugins/codecompletion/src/main/resources/net/sourceforge/squirrel_sql/plugins/codecompletion/Resources.properties
trunk/sql12/plugins/codecompletion/src/main/resources/net/sourceforge/squirrel_sql/plugins/codecompletion/completionfunctions/
trunk/sql12/plugins/codecompletion/src/main/resources/net/sourceforge/squirrel_sql/plugins/codecompletion/completionfunctions/I18NStrings.properties
trunk/sql12/plugins/codecompletion/src/main/resources/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/
trunk/sql12/plugins/codecompletion/src/main/resources/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/I18NStrings.properties
trunk/sql12/plugins/codecompletion/src/test/
trunk/sql12/plugins/codecompletion/src/test/java/
trunk/sql12/plugins/codecompletion/src/test/java/net/
trunk/sql12/plugins/codecompletion/src/test/java/net/sourceforge/
trunk/sql12/plugins/codecompletion/src/test/java/net/sourceforge/squirrel_sql/
trunk/sql12/plugins/codecompletion/src/test/java/net/sourceforge/squirrel_sql/plugins/
trunk/sql12/plugins/codecompletion/src/test/java/net/sourceforge/squirrel_sql/plugins/codecompletion/
trunk/sql12/plugins/codecompletion/src/test/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionPluginTest.java
trunk/sql12/plugins/codecompletion/src/test/java/net/sourceforge/squirrel_sql/plugins/codecompletion/ResourcesTest.java
trunk/sql12/plugins/codecompletion/src/test/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/
trunk/sql12/plugins/codecompletion/src/test/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferencesTest.java
trunk/sql12/plugins/codecompletion/src/test/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/PrefixedConfigTest.java
trunk/sql12/plugins/codecompletion/src/test/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/PrefixesTableModelTest.java
Removed Paths:
-------------
trunk/sql12/plugins/codecompletion/doc/
trunk/sql12/plugins/codecompletion/plugin_build.xml
trunk/sql12/plugins/codecompletion/src/net/
Property Changed:
----------------
trunk/sql12/plugins/codecompletion/
Property changes on: trunk/sql12/plugins/codecompletion
___________________________________________________________________
Added: svn:ignore
+ target
.settings
.project
.classpath
Deleted: trunk/sql12/plugins/codecompletion/plugin_build.xml
===================================================================
--- trunk/sql12/plugins/codecompletion/plugin_build.xml 2010-08-21 16:26:51 UTC (rev 5806)
+++ trunk/sql12/plugins/codecompletion/plugin_build.xml 2010-08-21 17:35:27 UTC (rev 5807)
@@ -1,87 +0,0 @@
-<?xml version="1.0"?>
-<!--
- This is an Apache Ant build file to build the code completion plugin
- for distribution.
--->
-<project name="plugin-codecompletion" default="build" basedir=".">
- <target name="init">
- <tstamp/>
- <property name="internal_name" value="codecompletion"/>
- <property name="version" value="1.0"/>
-
- <property name="debug" value="on"/>
- <property name="optimize" value="off"/>
- <property name="deprecation" value="on"/>
- <property name="targetVM" value="1.6"/>
-
- <echo message="---------------- ${internal_name} ${version} ----------------"/>
- <property environment="env"/>
- </target>
-
- <target name="initdirs" unless="p_plugin.work_dir">
- <property name="dist_dir" value="../../../squirrel-sql-dist/squirrel-sql"/>
- <property name="plugins_dist_dir" value="${dist_dir}/plugins"/>
- <property name="p_plugin.work_dir" value="${plugins_dist_dir}/${internal_name}/work"/>
- <property name="p_plugin.core_libs_dir" value="${dist_dir}/core/dist/lib"/>
- <property name="p_plugin.dist_dir" value="${dist_dir}/core/dist/plugins"/>
- </target>
-
- <!--
- ==================================================================
- Compile the plugin.
- No parameters.
- ==================================================================
- -->
- <target name="build" depends="init, initdirs">
- <property name="obj_dir" value="${p_plugin.work_dir}/obj"/>
-
- <mkdir dir="${obj_dir}"/>
- <mkdir dir="${p_plugin.dist_dir}"/>
-
- <javac srcdir="src"
- destdir="${obj_dir}"
- deprecation="${deprecation}"
- debug="${debug}"
- optimize="${optimize}"
- includeJavaRuntime="yes"
- source="${targetVM}"
- target="${targetVM}">
-
- <classpath>
- <fileset dir="${p_plugin.core_libs_dir}">
- <include name="**/*.*"/>
- </fileset>
- </classpath>
- </javac>
- <copy todir="${obj_dir}" >
- <fileset dir="src" >
- <include name="**/*.gif"/>
- <include name="**/*.jpg"/>
- <include name="**/*.jpeg"/>
- <include name="**/*.xml"/>
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <jar jarfile="${p_plugin.dist_dir}/${internal_name}.jar" compress="false">
- <fileset dir="${obj_dir}">
- <include name="**/*.*"/>
- </fileset>
- </jar>
-
- <copy todir="${p_plugin.dist_dir}/${internal_name}" >
- <fileset dir="doc" >
- <include name="*.*"/>
- </fileset>
- </copy>
-
- <jar jarfile="${p_plugin.dist_dir}/${internal_name}/src.jar" compress="false">
- <fileset dir=".">
- <include name="src/**/*.*"/>
- <include name="plugin_build.xml"/>
- </fileset>
- </jar>
- </target>
-
-</project>
-
Added: trunk/sql12/plugins/codecompletion/pom.xml
===================================================================
--- trunk/sql12/plugins/codecompletion/pom.xml (rev 0)
+++ trunk/sql12/plugins/codecompletion/pom.xml 2010-08-21 17:35:27 UTC (rev 5807)
@@ -0,0 +1,135 @@
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>squirrelsql-plugins-parent-pom</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </parent>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>codecompletion</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Codecompletion Plugin</name>
+ <description>Codecompletion Plugin</description>
+ <inceptionYear>2001</inceptionYear>
+ <developers>
+ <developer>
+ <name>Gerd Wagner</name>
+ <roles>
+ <role>Administrator</role>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Rob Manning</name>
+ <roles>
+ <role>Developer</role>
+ <role>Release Manager</role>
+ </roles>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <url>http://www.squirrelsql.org/</url>
+ <scm>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection>
+ <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url>
+ </scm>
+ <issueManagement>
+ <system>SourceForge Tracker</system>
+ <url>http://sourceforge.net/tracker/?group_id=28383%26atid=393414</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Hudson</system>
+ <url>https://www.squirrel-sql.org/hudson/</url>
+ </ciManagement>
+ <dependencies>
+ <dependency>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>fw</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrel-sql</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrel-sql</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrelsql-test-utils</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>${source-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire-plugin-version}</version>
+ <configuration>
+ <parallel>${surefire-parallel-type}</parallel>
+ <threadCount>${surefire-thread-count}</threadCount>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${jar-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${assembly-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>${findbugs-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>${pmd-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle-plugin-version}</version>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <!--
+ Since generating javadoc can be time-consuming, this is not done unless a "javadoc" profile is activated.
+ -->
+ <profile>
+ <id>javadoc</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadoc-plugin-version}</version>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
Copied: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/AutoCorrectProvider.java (from rev 5805, trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/AutoCorrectProvider.java)
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/AutoCorrectProvider.java (rev 0)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/AutoCorrectProvider.java 2010-08-21 17:35:27 UTC (rev 5807)
@@ -0,0 +1,8 @@
+package net.sourceforge.squirrel_sql.plugins.codecompletion;
+
+import java.util.Hashtable;
+
+public interface AutoCorrectProvider
+{
+ Hashtable<String, String> getAutoCorrects();
+}
Copied: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionAutoCorrectInfo.java (from rev 5805, trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionAutoCorrectInfo.java)
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionAutoCorrectInfo.java (rev 0)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionAutoCorrectInfo.java 2010-08-21 17:35:27 UTC (rev 5807)
@@ -0,0 +1,30 @@
+package net.sourceforge.squirrel_sql.plugins.codecompletion;
+
+
+
+public class CodeCompletionAutoCorrectInfo extends CodeCompletionInfo
+{
+ private String _toCorrect;
+ private String _correction;
+
+ public CodeCompletionAutoCorrectInfo(String toCorrect, String correction)
+ {
+ _toCorrect = toCorrect;
+ _correction = correction;
+ }
+
+ public String getCompareString()
+ {
+ return _toCorrect;
+ }
+
+ public String toString()
+ {
+ return _correction + " ;-)";
+ }
+
+ public String getCompletionString()
+ {
+ return _correction;
+ }
+}
Copied: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionCatalogInfo.java (from rev 5805, trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionCatalogInfo.java)
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionCatalogInfo.java (rev 0)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionCatalogInfo.java 2010-08-21 17:35:27 UTC (rev 5807)
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2004 Gerd Wagner
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+package net.sourceforge.squirrel_sql.plugins.codecompletion;
+
+
+public class CodeCompletionCatalogInfo extends CodeCompletionInfo
+{
+ private String _catalog;
+
+ public CodeCompletionCatalogInfo(String catalog)
+ {
+ _catalog = catalog;
+ }
+
+ public String getCompareString()
+ {
+ return _catalog;
+ }
+
+ public String toString()
+ {
+ return _catalog;
+ }
+}
\ No newline at end of file
Copied: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionColumnInfo.java (from rev 5805, trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionColumnInfo.java)
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionColumnInfo.java (rev 0)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionColumnInfo.java 2010-08-21 17:35:27 UTC (rev 5807)
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2003 Gerd Wagner
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+package net.sourceforge.squirrel_sql.plugins.codecompletion;
+
+
+public class CodeCompletionColumnInfo extends CodeCompletionInfo
+{
+ private String _columnName;
+ private String _columnType;
+ private int _columnSize;
+ private boolean _nullable;
+ private boolean _useCompletionPrefs;
+ private boolean _showRemarksInColumnCompletion;
+
+ private String _toString;
+ private int _decimalDigits;
+
+ private String _remarks;
+
+
+ public CodeCompletionColumnInfo(String columnName, String remarks, String columnType, int columnSize, int decimalDigits, boolean nullable, boolean useCompletionPrefs, boolean showRemarksInColumnCompletion)
+ {
+ _columnName = columnName;
+ _columnType = columnType;
+ _columnSize = columnSize;
+ _decimalDigits = decimalDigits;
+ _nullable = nullable;
+ _useCompletionPrefs = useCompletionPrefs;
+ _showRemarksInColumnCompletion = showRemarksInColumnCompletion;
+ String decimalDigitsString = 0 == _decimalDigits ? "" : "," + _decimalDigits;
+ _remarks = remarks;
+ _toString = _columnName + getRemarksString() + _columnType + "(" + _columnSize + decimalDigitsString + ") " + (_nullable? "NULL": "NOT NULL");
+ }
+
+ private String getRemarksString()
+ {
+ String ret = " ";
+ if (_showRemarksInColumnCompletion && null != _remarks && 0 < _remarks.trim().length())
+ {
+ ret = " (" + _remarks + ") ";
+ }
+ return ret;
+ }
+
+ public String getCompareString()
+ {
+ return _columnName;
+ }
+
+ public String toString()
+ {
+ return _toString;
+ }
+}
Copied: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionFunctionInfo.java (from rev 5805, trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionFunctionInfo.java)
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionFunctionInfo.java (rev 0)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionFunctionInfo.java 2010-08-21 17:35:27 UTC (rev 5807)
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2003 Gerd Wagner
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+package net.sourceforge.squirrel_sql.plugins.codecompletion;
+
+
+public class CodeCompletionFunctionInfo extends CodeCompletionInfo
+{
+ private String _function;
+
+ public CodeCompletionFunctionInfo(String function)
+ {
+ _function = function;
+ }
+
+ public String getCompareString()
+ {
+ return _function;
+ }
+
+ public String toString()
+ {
+ return _function;
+ }
+}
Copied: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfo.java (from rev 5805, trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfo.java)
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfo.java (rev 0)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfo.java 2010-08-21 17:35:27 UTC (rev 5807)
@@ -0,0 +1,28 @@
+package net.sourceforge.squirrel_sql.plugins.codecompletion;
+
+import net.sourceforge.squirrel_sql.fw.completion.CompletionInfo;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+
+
+public abstract class CodeCompletionInfo extends CompletionInfo
+{
+ /**
+ * Default implementation
+ */
+ public ArrayList<CodeCompletionInfo> getColumns(net.sourceforge.squirrel_sql.client.session.schemainfo.SchemaInfo schemaInfo, String colNamePattern) throws SQLException
+ {
+ return new ArrayList<CodeCompletionInfo>();
+ }
+
+
+ /**
+ * Will be called after getCompletionString()
+ * @return Position to mo mve the Carret back counted from the end of the completion string.
+ */
+ public int getMoveCarretBackCount()
+ {
+ return 0;
+ }
+}
Copied: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfoCollection.java (from rev 5805, trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfoCollection.java)
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfoCollection.java (rev 0)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfoCollection.java 2010-08-21 17:35:27 UTC (rev 5807)
@@ -0,0 +1,345 @@
+/*
+ * Copyright (C) 2003 Gerd Wagner
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+package net.sourceforge.squirrel_sql.plugins.codecompletion;
+
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.schemainfo.SchemaInfoUpdateListener;
+import net.sourceforge.squirrel_sql.client.session.parser.kernel.TableAliasInfo;
+import net.sourceforge.squirrel_sql.fw.sql.IProcedureInfo;
+import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.plugins.codecompletion.prefs.CodeCompletionPreferences;
+
+import javax.swing.*;
+import java.util.*;
+
+public class CodeCompletionInfoCollection
+{
+ private static final StringManager s_stringMgr =
+ StringManagerFactory.getStringManager(CodeCompletionInfoCollection.class);
+
+
+ private Hashtable<String, Vector<CodeCompletionInfo>> _completionInfosByCataLogAndSchema =
+ new Hashtable<String, Vector<CodeCompletionInfo>>();
+ private Vector<CodeCompletionInfo> _aliasCompletionInfos =
+ new Vector<CodeCompletionInfo>();
+
+ private Vector<CodeCompletionSchemaInfo> _schemas =
+ new Vector<CodeCompletionSchemaInfo>();
+ private Vector<CodeCompletionCatalogInfo> _catalogs =
+ new Vector<CodeCompletionCatalogInfo>();
+
+ private ISession _session;
+ private CodeCompletionPlugin _plugin;
+ private boolean _useCompletionPrefs;
+
+ private static final int MAX_COMPLETION_INFOS = 300;
+
+ // i18n[codecompletion.listTruncated=Completion list truncated. Narrow by typing to get missing entries.]
+ private static final String TOO_MANY_COMPLETION_INFOS = s_stringMgr.getString("codecompletion.listTruncated");
+ private CodeCompletionPreferences _prefs;
+
+ public CodeCompletionInfoCollection(ISession session, CodeCompletionPlugin plugin, boolean useCompletionPrefs)
+ {
+ _session = session;
+ _plugin = plugin;
+ _useCompletionPrefs = useCompletionPrefs;
+
+ _prefs = (CodeCompletionPreferences) _session.getPluginObject(_plugin, CodeCompletionPlugin.PLUGIN_OBJECT_PREFS_KEY);
+
+ _session.getSchemaInfo().addSchemaInfoUpdateListener(new SchemaInfoUpdateListener()
+ {
+ public void schemaInfoUpdated()
+ {
+ _completionInfosByCataLogAndSchema =
+ new Hashtable<String, Vector<CodeCompletionInfo>>();
+ }
+ });
+ }
+
+ private void load(String catalog, String schema, boolean showLoadingMessage)
+ {
+ String key = (catalog + "," + schema).toUpperCase();
+
+ if(null == _completionInfosByCataLogAndSchema.get(key))
+ {
+ if(!_session.getSchemaInfo().isLoaded())
+ {
+ if(showLoadingMessage)
+ {
+ // i18n[codecompletion.beingLoaded=Code competion infomation is still being loaded.\nTry again later.]
+ String msg = s_stringMgr.getString("codecompletion.beingLoaded");
+ JOptionPane.showMessageDialog(_session.getApplication().getMainFrame(), msg);
+ }
+ return;
+ }
+
+ Vector<CodeCompletionInfo> completionInfos = new Vector<CodeCompletionInfo>();
+
+ ITableInfo[] tables = _session.getSchemaInfo().getITableInfos(catalog, schema);
+
+ Hashtable<String, CodeCompletionInfo> completionInfoByUcTableName = new Hashtable<String, CodeCompletionInfo>();
+
+
+ for (int i = 0; i < tables.length; i++)
+ {
+ String ucTableName = tables[i].getSimpleName().toUpperCase();
+
+ CodeCompletionTableInfo dupl = (CodeCompletionTableInfo) completionInfoByUcTableName.get(ucTableName);
+
+ CodeCompletionTableInfo tableInfo = new CodeCompletionTableInfo(tables[i].getSimpleName(),
+ tables[i].getType(),
+ tables[i].getCatalogName(),
+ tables[i].getSchemaName(),
+ _useCompletionPrefs,
+ _prefs.isShowRemarksInColumnCompletion());
+
+ if(null != dupl)
+ {
+ tableInfo.setHasDuplicateNameInDfifferentSchemas();
+ dupl.setHasDuplicateNameInDfifferentSchemas();
+ }
+
+ completionInfos.add(tableInfo);
+ completionInfoByUcTableName.put(ucTableName, tableInfo);
+ }
+
+ IProcedureInfo[] storedProceduresInfos = _session.getSchemaInfo().getStoredProceduresInfos(catalog, schema);
+ for (int i = 0; i < storedProceduresInfos.length; i++)
+ {
+ CodeCompletionStoredProcedureInfo buf =
+ new CodeCompletionStoredProcedureInfo(storedProceduresInfos[i].getSimpleName(),
+ storedProceduresInfos[i].getProcedureType(),
+ _session,
+ catalog,
+ schema,
+ _useCompletionPrefs,
+ _prefs);
+ completionInfos.add(buf);
+ }
+
+
+ if(null == catalog && null == schema)
+ {
+ // These objects do not depend on catalogs or schemas.
+ // It is enough if we load them once.
+
+ String[] keywords = _session.getSchemaInfo().getKeywords();
+ for (int i = 0; i < keywords.length; i++)
+ {
+ completionInfos.add(new CodeCompletionKeywordInfo(keywords[i]));
+ }
+
+ String[] dataTypes = _session.getSchemaInfo().getDataTypes();
+ for (int i = 0; i < dataTypes.length; i++)
+ {
+
+ if(false == _session.getSchemaInfo().isTable(dataTypes[i]))
+ {
+ // For example Postgres returns table names as datatypes.
+ // In those cases this prevents to have the table names twice.
+ completionInfos.add(new CodeCompletionTypeInfo(dataTypes[i]));
+ }
+ }
+
+ String[] functions = _session.getSchemaInfo().getFunctions();
+ for (int i = 0; i < functions.length; i++)
+ {
+ completionInfos.add(new CodeCompletionFunctionInfo(functions[i]));
+ }
+
+ String[] catalogs = _session.getSchemaInfo().getCatalogs();
+ for (int i = 0; i < catalogs.length; i++)
+ {
+ completionInfos.add(new CodeCompletionCatalogInfo(catalogs[i]));
+ _catalogs.add(new CodeCompletionCatalogInfo(catalogs[i]));
+ }
+
+ String[] schemas = _session.getSchemaInfo().getSchemas();
+ for (int i = 0; i < schemas.length; i++)
+ {
+ completionInfos.add(new CodeCompletionSchemaInfo(schemas[i]));
+ _schemas.add(new CodeCompletionSchemaInfo(schemas[i]));
+ }
+
+ AutoCorrectProvider autoCorrectProvider =
+ (AutoCorrectProvider) _session.getApplication().getPluginManager().bindExternalPluginService("syntax", AutoCorrectProvider.class);
+
+ if(null == autoCorrectProvider)
+ {
+ // i18n[codecompletion.useSyntaxPlugin=Code completion will work better if you use the Syntax plugin. Get it from squirrelsql.org, it's free!]
+ _session.showMessage(s_stringMgr.getString("codecompletion.useSyntaxPlugin"));
+ }
+ else
+ {
+ Hashtable<String, String> autoCorrections = autoCorrectProvider.getAutoCorrects();
+
+ for(Enumeration<String> e=autoCorrections.keys(); e.hasMoreElements();)
+ {
+ String toCorrect = e.nextElement();
+ String correction = autoCorrections.get(toCorrect);
+
+ completionInfos.add(new CodeCompletionAutoCorrectInfo(toCorrect, correction));
+ }
+ }
+
+ }
+
+
+
+ Collections.sort(completionInfos);
+
+ _completionInfosByCataLogAndSchema.put(key, completionInfos);
+ }
+ }
+
+
+ public CodeCompletionInfo[] getInfosStartingWith(String catalog, String schema, String prefix)
+ {
+ load(catalog, schema, true);
+
+ Vector<CodeCompletionInfo> completionInfos = getCompletionInfos(catalog, schema);
+
+ if(null == completionInfos)
+ {
+ // CompletionInfos are still loading
+ return new CodeCompletionInfo[0];
+ }
+
+ String upperCasePrefix = prefix.trim().toUpperCase();
+
+ if("".equals(upperCasePrefix))
+ {
+ Vector<CodeCompletionInfo> buf = new Vector<CodeCompletionInfo>();
+ buf.addAll(_aliasCompletionInfos);
+
+ if(MAX_COMPLETION_INFOS < completionInfos.size())
+ {
+ buf.addAll(completionInfos.subList(0,MAX_COMPLETION_INFOS));
+ _session.showMessage(TOO_MANY_COMPLETION_INFOS);
+ }
+ else
+ {
+ buf.addAll(completionInfos);
+ }
+
+
+ return buf.toArray(new CodeCompletionInfo[0]);
+ }
+
+ Vector<CodeCompletionInfo> ret = new Vector<CodeCompletionInfo>();
+
+ for(int i=0; i < _aliasCompletionInfos.size(); ++i)
+ {
+ CodeCompletionInfo buf = _aliasCompletionInfos.get(i);
+ if(buf.upperCaseCompletionStringStartsWith(upperCasePrefix))
+ {
+ ret.add(buf);
+ }
+ }
+
+
+ for(int i=0; i < completionInfos.size(); ++i)
+ {
+ CodeCompletionInfo buf = completionInfos.get(i);
+ if(buf.upperCaseCompletionStringStartsWith(upperCasePrefix))
+ {
+ ret.add(buf);
+
+ if(MAX_COMPLETION_INFOS < ret.size())
+ {
+ _session.showMessage(TOO_MANY_COMPLETION_INFOS);
+ break;
+ }
+ }
+ }
+
+ return ret.toArray(new CodeCompletionInfo[0]);
+ }
+
+ private Vector<CodeCompletionInfo> getCompletionInfos(String catalog, String schema)
+ {
+ String key = (catalog + "," + schema).toUpperCase();
+ Vector<CodeCompletionInfo> ret = _completionInfosByCataLogAndSchema.get(key);
+
+ if(null == ret)
+ {
+ load(catalog, schema, false);
+ }
+ ret = _completionInfosByCataLogAndSchema.get(key);
+
+ return ret;
+ }
+
+ public void replaceLastAliasInfos(TableAliasInfo[] aliasInfos)
+ {
+ _aliasCompletionInfos = new Vector<CodeCompletionInfo>(aliasInfos.length);
+
+ for (int i = 0; i < aliasInfos.length; i++)
+ {
+ if(false == aliasInfos[i].aliasName.startsWith("#"))
+ {
+ _aliasCompletionInfos.add(new CodeCompletionTableAliasInfo(aliasInfos[i], _useCompletionPrefs, _prefs.isShowRemarksInColumnCompletion()));
+ }
+ }
+ }
+
+ public boolean isCatalog(String name)
+ {
+ for (int i = 0; i < _catalogs.size(); i++)
+ {
+ CodeCompletionCatalogInfo info = _catalogs.get(i);
+ if(info.getCompareString().equalsIgnoreCase(name))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public boolean isSchema(String name)
+ {
+ for (int i = 0; i < _schemas.size(); i++)
+ {
+ CodeCompletionSchemaInfo info = _schemas.get(i);
+ if(info.getCompareString().equalsIgnoreCase(name))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public boolean addCompletionsAtListBegin(String catalog, String schema, CodeCompletionInfo[] completions)
+ {
+ Vector<CodeCompletionInfo> completionInfos = getCompletionInfos(catalog, schema);
+
+ if(null == completionInfos)
+ {
+ // CompletionInfos are still loading
+ return false;
+ }
+ else
+ {
+ Arrays.sort(completions);
+ completionInfos.addAll(0,Arrays.asList(completions));
+ return true;
+ }
+ }
+}
Copied: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionKeywordInfo.java (from rev 5805, trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionKeywordInfo.java)
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionKeywordInfo.java (rev 0)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionKeywordInfo.java 2010-08-21 17:35:27 UTC (rev 5807)
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2003 Gerd Wagner
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+package net.sourceforge.squirrel_sql.plugins.codecompletion;
+
+
+public class CodeCompletionKeywordInfo extends CodeCompletionInfo
+{
+ private String _keyword;
+
+ public CodeCompletionKeywordInfo(String keyword)
+ {
+ _keyword = keyword;
+ }
+
+ public String getCompareString()
+ {
+ return _keyword;
+ }
+
+ public String toString()
+ {
+ return _keyword;
+ }
+}
Copied: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionPlugin.java (from rev 5805, trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionPlugin.java)
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionPlugin.java (rev 0)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionPlugin.java 2010-08-21 17:35:27 UTC (rev 5807)
@@ -0,0 +1,344 @@
+package net.sourceforge.squirrel_sql.plugins.codecompletion;
+/*
+ * Copyright (C) 2003 Gerd Wagner
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+import net.sourceforge.squirrel_sql.client.gui.session.ObjectTreeInternalFrame;
+import net.sourceforge.squirrel_sql.client.gui.session.SQLInternalFrame;
+import net.sourceforge.squirrel_sql.client.plugin.DefaultSessionPlugin;
+import net.sourceforge.squirrel_sql.client.plugin.PluginException;
+import net.sourceforge.squirrel_sql.client.plugin.PluginResources;
+import net.sourceforge.squirrel_sql.client.plugin.PluginSessionCallback;
+import net.sourceforge.squirrel_sql.client.preferences.INewSessionPropertiesPanel;
+import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreePanel;
+import net.sourceforge.squirrel_sql.client.session.properties.ISessionPropertiesPanel;
+import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
+import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
+import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+import net.sourceforge.squirrel_sql.fw.util.Utilities;
+import net.sourceforge.squirrel_sql.fw.xml.XMLBeanReader;
+import net.sourceforge.squirrel_sql.fw.xml.XMLBeanWriter;
+import net.sourceforge.squirrel_sql.plugins.codecompletion.prefs.CodeCompletionPreferences;
+import net.sourceforge.squirrel_sql.plugins.codecompletion.prefs.CodeCompletionPreferencesController;
+
+import javax.swing.*;
+import java.io.File;
+import java.util.Iterator;
+
+/**
+ * The plugin class.
+ *
+ * @author Gerd Wagner
+ */
+public class CodeCompletionPlugin extends DefaultSessionPlugin
+{
+ /** Logger for this class. */
+ @SuppressWarnings("unused")
+ private final static ILogger
+ s_log = LoggerController.createLogger(CodeCompletionPlugin.class);
+
+
+ /** Resources for this plugin. */
+ private Resources _resources;
+ private static final String PREFS_FILE_NAME = "codecompletionprefs.xml";
+
+ private CodeCompletionPreferences _newSessionPrefs;
+ public static final String PLUGIN_OBJECT_PREFS_KEY = "codecompletionprefs";
+
+ /**
+ * Return the internal name of this plugin.
+ *
+ * @return the internal name of this plugin.
+ */
+ public String getInternalName()
+ {
+ return "codecompletion";
+ }
+
+ /**
+ * Return the descriptive name of this plugin.
+ *
+ * @return the descriptive name of this plugin.
+ */
+ public String getDescriptiveName()
+ {
+ return "SQL Entry Code Completion";
+ }
+
+ /**
+ * Returns the current version of this plugin.
+ *
+ * @return the current version of this plugin.
+ */
+ public String getVersion()
+ {
+ return "1.0";
+ }
+
+
+ /**
+ * Returns a comma separated list of other contributors.
+ *
+ * @return Contributors names.
+ */
+ public String getContributors()
+ {
+ return "Christian Sell";
+ }
+
+ /**
+ * Returns the authors name.
+ *
+ * @return the authors name.
+ */
+ public String getAuthor()
+ {
+ return "Gerd Wagner";
+ }
+
+ /**
+ * Returns the name of the change log for the plugin. This should
+ * be a text or HTML file residing in the <TT>getPluginAppSettingsFolder</TT>
+ * directory.
+ *
+ * @return the changelog file name or <TT>null</TT> if plugin doesn't have
+ * a change log.
+ */
+ public String getChangeLogFileName()
+ {
+ return "changes.txt";
+ }
+
+ /**
+ * Returns the name of the Help file for the plugin. This should
+ * be a text or HTML file residing in the <TT>getPluginAppSettingsFolder</TT>
+ * directory.
+ *
+ * @return the Help file name or <TT>null</TT> if plugin doesn't have
+ * a help file.
+ */
+ public String getHelpFileName()
+ {
+ return "readme.html";
+ }
+
+ /**
+ * Returns the name of the Licence file for the plugin. This should
+ * be a text or HTML file residing in the <TT>getPluginAppSettingsFolder</TT>
+ * directory.
+ *
+ * @return the Licence file name or <TT>null</TT> if plugin doesn't have
+ * a licence file.
+ */
+ public String getLicenceFileName()
+ {
+ return "licence.txt";
+ }
+
+ /**
+ * Called on application startup after application started.
+ */
+ public void initialize() throws PluginException
+ {
+ _resources = new Resources(this);
+ loadPrefs();
+ }
+
+ public void unload()
+ {
+ savePrefs();
+ }
+
+ private void savePrefs()
+ {
+ try
+ {
+ File prefsFile = new File(getPluginUserSettingsFolder(), PREFS_FILE_NAME);
+ final XMLBeanWriter wtr = new XMLBeanWriter(_newSessionPrefs);
+ wtr.save(prefsFile);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+
+
+ private void loadPrefs()
+ {
+ try
+ {
+ _newSessionPrefs = new CodeCompletionPreferences();
+ File prefsFile = new File(getPluginUserSettingsFolder(), PREFS_FILE_NAME);
+ if(prefsFile.exists())
+ {
+ XMLBeanReader reader = new XMLBeanReader();
+ reader.load(prefsFile, getClass().getClassLoader());
+
+ Iterator<?> it = reader.iterator();
+
+ if (it.hasNext())
+ {
+ _newSessionPrefs = (CodeCompletionPreferences) it.next();
+ }
+
+ }
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+
+ /**
+ * Create preferences panel for the New Session Properties dialog.
+ *
+ * @return preferences panel.
+ */
+ public INewSessionPropertiesPanel[] getNewSessionPropertiesPanels()
+ {
+ return new INewSessionPropertiesPanel[]
+ {
+ new CodeCompletionPreferencesController(_newSessionPrefs)
+ };
+ }
+
+ /**
+ * Create panels for the Session Properties dialog.
+ *
+ * @return Array of panels for the properties dialog.
+ */
+ public ISessionPropertiesPanel[] getSessionPropertiesPanels(ISession session)
+ {
+ CodeCompletionPreferences sessionPrefs = (CodeCompletionPreferences)session.getPluginObject(this, PLUGIN_OBJECT_PREFS_KEY);
+
+ return new ISessionPropertiesPanel[]
+ {
+ new CodeCompletionPreferencesController(sessionPrefs)
+ };
+ }
+
+ public void sessionCreated(ISession session)
+ {
+ CodeCompletionPreferences prefs = (CodeCompletionPreferences) Utilities.cloneObject(_newSessionPrefs, getClass().getClassLoader());
+ session.putPluginObject(this, PLUGIN_OBJECT_PREFS_KEY, prefs);
+ }
+
+
+ public boolean allowsSessionStartedInBackground()
+ {
+ return true;
+ }
+
+ /**
+ * Session has been started.
+ *
+ * @param session Session that has started.
+ */
+ public PluginSessionCallback sessionStarted(final ISession session)
+ {
+ ISQLPanelAPI sqlPaneAPI = session.getSessionSheet().getSQLPaneAPI();
+ initCodeCompletionSqlEditor(sqlPaneAPI, session);
+
+ initCodeCompletionObjectTreeFind(session, session.getSessionSheet().getObjectTreePanel());
+
+ PluginSessionCallback ret = new PluginSessionCallback()
+ {
+ public void sqlInternalFrameOpened(final SQLInternalFrame sqlInternalFrame, final ISession sess)
+ {
+ initCodeCompletionSqlEditor(sqlInternalFrame.getSQLPanelAPI(), sess);
+ }
+
+ public void objectTreeInternalFrameOpened(ObjectTreeInternalFrame objectTreeInternalFrame, ISession sess)
+ {
+ initCodeCompletionObjectTreeFind(sess, objectTreeInternalFrame.getObjectTreePanel());
+ }
+ };
+
+ return ret;
+ }
+
+ private void initCodeCompletionSqlEditor(final ISQLPanelAPI sqlPaneAPI, final ISession session)
+ {
+ GUIUtils.processOnSwingEventThread(new Runnable()
+ {
+ public void run()
+ {
+ CodeCompletionInfoCollection c = new CodeCompletionInfoCollection(session, CodeCompletionPlugin.this, true);
+
+ CompleteCodeAction cca =
+ new CompleteCodeAction(session.getApplication(),
+ CodeCompletionPlugin.this,
+ sqlPaneAPI.getSQLEntryPanel(),
+ session,
+ c,
+ null);
+
+ JMenuItem item = sqlPaneAPI.addToSQLEntryAreaMenu(cca);
+
+ _resources.configureMenuItem(cca, item);
+
+ JComponent comp = sqlPaneAPI.getSQLEntryPanel().getTextComponent();
+ comp.registerKeyboardAction(cca, _resources.getKeyStroke(cca), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+
+ sqlPaneAPI.addToToolsPopUp("completecode", cca);
+ }
+
+ });
+ }
+
+ private void initCodeCompletionObjectTreeFind(final ISession session, final ObjectTreePanel objectTreePanel)
+ {
+ GUIUtils.processOnSwingEventThread(new Runnable()
+ {
+ public void run()
+ {
+ ISQLEntryPanel findEntryPanel = objectTreePanel.getFindController().getFindEntryPanel();
+
+ CodeCompletionInfoCollection c = new CodeCompletionInfoCollection(session, CodeCompletionPlugin.this, false);
+
+ CompleteCodeAction cca =
+ new CompleteCodeAction(session.getApplication(),
+ CodeCompletionPlugin.this,
+ findEntryPanel,
+ session,
+ c,
+ objectTreePanel);
+
+
+ JComponent comp = findEntryPanel.getTextComponent();
+ comp.registerKeyboardAction(cca, _resources.getKeyStroke(cca), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+ }
+
+ });
+ }
+
+ /**
+ * Retrieve plugins resources.
+ *
+ * @return Plugins resources.
+ */
+ public PluginResources getResources()
+ {
+ return _resources;
+ }
+
+}
Copied: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionSchemaInfo.java (from rev 5805, trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionSchemaInfo.java)
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionSchemaInfo.java (rev 0)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionSchemaInfo.java 2010-08-21 17:35:27 UTC (rev 5807)
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2004 Gerd Wagner
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+package net.sourceforge.squirrel_sql.plugins.codecompletion;
+
+
+public class CodeCompletionSchemaInfo extends CodeCompletionInfo
+{
+ private String _schema;
+
+ public CodeCompletionSchemaInfo(String schema)
+ {
+ _schema = schema;
+ }
+
+ public String getCompareString()
+ {
+ return _schema;
+ }
+
+ public String toString()
+ {
+ return _schema;
+ }
+}
\ No newline at end of file
Copied: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionStoredProcedureInfo.java (from rev 5805, trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionStoredProcedureInfo.java)
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionStoredProcedureInfo.java (rev 0)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionStoredProcedureInfo.java 2010-08-21 17:35:27 UTC (rev 5807)
@@ -0,0 +1,222 @@
+package net.sourceforge.squirrel_sql.plugins.codecompletion;
+
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.plugins.codecompletion.prefs.CodeCompletionPreferences;
+import net.sourceforge.squirrel_sql.plugins.codecompletion.prefs.PrefixedConfig;
+
+import java.sql.SQLException;
+import java.sql.ResultSet;
+import java.sql.DatabaseMetaData;
+import java.util.Vector;
+
+
+public class CodeCompletionStoredProcedureInfo extends CodeCompletionInfo
+{
+ private String _procName;
+ private int _procType;
+ private ISession _session;
+ private boolean _useCompletionPrefs;
+ private String _catalog;
+ private String _schema;
+ private int _moveCarretBackCount = 0;
+
+ private String _toString;
+
+ private String _params = null;
+
+ /**
+ * This Sessions prefs. Note it is just a reference. Contents change when user changes Session properties.
+ */
+ private CodeCompletionPreferences _prefs;
+
+ public CodeCompletionStoredProcedureInfo(String procName, int procType, ISession session, String catalog, String schema, boolean useCompletionPrefs, CodeCompletionPreferences prefs)
+ {
+ _procName = procName;
+ _procType = procType;
+ _session = session;
+ _useCompletionPrefs = useCompletionPrefs;
+ _prefs = prefs;
+ _catalog = catalog;
+ _schema = schema;
+
+ _toString = _procName + " (SP)";
+
+ }
+
+ public String getCompareString()
+ {
+ return _procName;
+ }
+
+ public String getCompletionString()
+ {
+ try
+ {
+ if(false == _useCompletionPrefs)
+ {
+ _moveCarretBackCount = 0;
+ return _procName;
+ }
+
+
+ String ret = "";
+
+ int completionConfig = getCopmpletionConfig();
+
+ _moveCarretBackCount = 0;
+
+ String params = getParams();
+ switch (completionConfig)
+ {
+ case CodeCompletionPreferences.CONFIG_SP_WITH_PARARMS:
+ ret = "{call " + _procName + "(" + params + ")}";
+ if (0 < params.length())
+ {
+ _moveCarretBackCount = params.length() + 2;
+ }
+ break;
+ case CodeCompletionPreferences.CONFIG_SP_WITHOUT_PARARMS:
+ ret = "{call " + _procName + "()}";
+ if (0 < params.length())
+ {
+ _moveCarretBackCount = 2;
+ }
+ break;
+ case CodeCompletionPreferences.CONFIG_UDF_WITH_PARARMS:
+ ret = _procName + "(" + params + ")";
+ if (0 < params.length())
+ {
+ _moveCarretBackCount = params.length() + 1;
+ }
+ break;
+ case CodeCompletionPreferences.CONFIG_UDF_WITHOUT_PARARMS:
+ if (0 < params.length())
+ {
+ _moveCarretBackCount = 1;
+ }
+ ret = _procName + "()";
+ break;
+ }
+
+ return ret;
+ }
+ catch (SQLException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private int getCopmpletionConfig()
+ {
+ PrefixedConfig[] prefixedConfigs = _prefs.getPrefixedConfigs();
+
+ for (int i = 0; i < prefixedConfigs.length; i++)
+ {
+ if(_procName.toUpperCase().startsWith(prefixedConfigs[i].getPrefix().toUpperCase()))
+ {
+ return prefixedConfigs[i].getCompletionConfig();
+ }
+ }
+
+ return _prefs.getGeneralCompletionConfig();
+ }
+
+
+ private String getParams() throws SQLException
+ {
+ if (null == _params)
+ {
+ ResultSet res = _session.getSQLConnection().getConnection().getMetaData().getProcedureColumns(_catalog, _schema, _procName, null);
+
+ Vector<String> ret = new Vector<String>();
+ while (res.next())
+ {
+ switch (res.getInt("COLUMN_TYPE"))
+ {
+ case DatabaseMetaData.procedureColumnIn:
+ case DatabaseMetaData.procedureColumnOut:
+ case DatabaseMetaData.procedureColumnInOut:
+ ret.add(getParamString(res));
+ }
+ }
+ res.close();
+
+ String[] _paramStrings = ret.toArray(new String[ret.size()]);
+
+
+ _params = "";
+ if (0 < _paramStrings.length)
+ {
+ _params += _paramStrings[0];
+ }
+
+ for (int i = 1; i < _paramStrings.length; i++)
+ {
+ _params += ", " + _paramStrings[i];
+ }
+ }
+
+ return _params;
+ }
+
+ private String getParamString(ResultSet res) throws SQLException
+ {
+ String ret = "<";
+
+ switch(res.getInt("COLUMN_TYPE"))
+ {
+ case DatabaseMetaData.procedureColumnIn:
+ ret += "IN ";
+ break;
+ case DatabaseMetaData.procedureColumnOut:
+ ret += "OUT ";
+ break;
+ case DatabaseMetaData.procedureColumnInOut:
+ ret += "INOUT ";
+ break;
+ }
+
+ ret += res.getString("TYPE_NAME") + " ";
+
+ ret += res.getString("COLUMN_NAME");
+
+ String remarks = res.getString("REMARKS");
+
+ if(null != remarks)
+ {
+ ret += " " + remarks.replace('\n', ' ');
+ }
+
+ ret += ">";
+
+ return ret;
+ }
+
+ public String toString()
+ {
+ ...
[truncated message content] |
|
From: <man...@us...> - 2010-08-21 16:26:57
|
Revision: 5806
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5806&view=rev
Author: manningr
Date: 2010-08-21 16:26:51 +0000 (Sat, 21 Aug 2010)
Log Message:
-----------
Tagging the trunk prior to committing the changes for conversion to maven
Added Paths:
-----------
tags/pre-maven-conversion/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-08-21 14:20:17
|
Revision: 5805
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5805&view=rev
Author: manningr
Date: 2010-08-21 14:20:11 +0000 (Sat, 21 Aug 2010)
Log Message:
-----------
Patch 2991451 submitted by developer Bogdan Paulon (bpaulon). It adds a constraints node below Oracle tables.
Modified Paths:
--------------
trunk/sql12/doc/changes.txt
Modified: trunk/sql12/doc/changes.txt
===================================================================
--- trunk/sql12/doc/changes.txt 2010-08-21 14:19:06 UTC (rev 5804)
+++ trunk/sql12/doc/changes.txt 2010-08-21 14:20:11 UTC (rev 5805)
@@ -18,6 +18,8 @@
Incorporated patch which provides a node in the object tree called LOB which lists all LOBs, providing
details about each (Thanks to Bogdan Cristian Paulon)
+Incorporated patch which provides a node under each table in the object tree that lists all of the
+constraints for that table. (Thanks to Bogdan Cristian Paulon)
Bug-fixes:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-08-21 14:19:13
|
Revision: 5804
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5804&view=rev
Author: manningr
Date: 2010-08-21 14:19:06 +0000 (Sat, 21 Aug 2010)
Log Message:
-----------
Patch 2991451 submitted by developer Bogdan Paulon (bpaulon). It adds a constraints node below Oracle tables.
Modified Paths:
--------------
trunk/sql12/plugins/oracle/doc/changes.txt
Modified: trunk/sql12/plugins/oracle/doc/changes.txt
===================================================================
--- trunk/sql12/plugins/oracle/doc/changes.txt 2010-08-21 14:17:41 UTC (rev 5803)
+++ trunk/sql12/plugins/oracle/doc/changes.txt 2010-08-21 14:19:06 UTC (rev 5804)
@@ -5,6 +5,8 @@
====
- Incorporated patch which provides a node in the object tree called LOB which lists all LOBs, providing
details about each (Thanks to Bogdan Cristian Paulon)
+ - Incorporated patch which provides a node under each table in the object tree that lists all of the
+ constraints for that table. (Thanks to Bogdan Cristian Paulon)
0.20
====
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-08-21 14:17:49
|
Revision: 5803
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5803&view=rev
Author: manningr
Date: 2010-08-21 14:17:41 +0000 (Sat, 21 Aug 2010)
Log Message:
-----------
Patch 2991451 submitted by developer Bogdan Paulon (bpaulon). It adds a constraints node below Oracle tables.
Modified Paths:
--------------
trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/IObjectTypes.java
trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/OraclePlugin.java
trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/expander/TableExpander.java
trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/tab/I18NStrings.properties
Added Paths:
-----------
trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/
trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/AbstractConstraintSource.java
trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/CKConstraintSource.java
trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/ConstraintColumnInfo.java
trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/ConstraintInfo.java
trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/ConstraintSourceBuilder.java
trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/FKConstraintSource.java
trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/PKConstraintSource.java
trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/UQConstraintSource.java
trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentExpander.java
trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentInfo.java
trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/tab/ConstraintColumnInfoTab.java
trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/tab/ConstraintDetailsTab.java
trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/tab/ConstraintSourceTab.java
Modified: trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/IObjectTypes.java
===================================================================
--- trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/IObjectTypes.java 2010-08-21 12:29:59 UTC (rev 5802)
+++ trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/IObjectTypes.java 2010-08-21 14:17:41 UTC (rev 5803)
@@ -36,6 +36,7 @@
DatabaseObjectType TRIGGER_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Triggers");
DatabaseObjectType TYPE_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Types");
DatabaseObjectType USER_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Users");
+ DatabaseObjectType CONSTRAINT_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Constraints");
DatabaseObjectType CONSUMER_GROUP = DatabaseObjectType.createNewDatabaseObjectType("Consumer Group");
DatabaseObjectType INSTANCE = DatabaseObjectType.createNewDatabaseObjectType("Instance");
@@ -43,4 +44,5 @@
DatabaseObjectType PACKAGE = DatabaseObjectType.createNewDatabaseObjectType("Package");
DatabaseObjectType SESSION = DatabaseObjectType.createNewDatabaseObjectType("Session");
DatabaseObjectType TYPE = DatabaseObjectType.createNewDatabaseObjectType("Type");
+ DatabaseObjectType CONSTRAINT = DatabaseObjectType.createNewDatabaseObjectType("Constraint");
}
Modified: trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/OraclePlugin.java
===================================================================
--- trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/OraclePlugin.java 2010-08-21 12:29:59 UTC (rev 5802)
+++ trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/OraclePlugin.java 2010-08-21 14:17:41 UTC (rev 5803)
@@ -77,6 +77,7 @@
import net.sourceforge.squirrel_sql.plugins.oracle.SGAtrace.NewSGATraceWorksheetAction;
import net.sourceforge.squirrel_sql.plugins.oracle.dboutput.NewDBOutputWorksheetAction;
import net.sourceforge.squirrel_sql.plugins.oracle.exception.OracleExceptionFormatter;
+import net.sourceforge.squirrel_sql.plugins.oracle.expander.ConstraintParentExpander;
import net.sourceforge.squirrel_sql.plugins.oracle.expander.DefaultDatabaseExpander;
import net.sourceforge.squirrel_sql.plugins.oracle.expander.InstanceParentExpander;
import net.sourceforge.squirrel_sql.plugins.oracle.expander.OracleTableParentExpander;
@@ -93,6 +94,9 @@
import net.sourceforge.squirrel_sql.plugins.oracle.prefs.OraclePreferenceBean;
import net.sourceforge.squirrel_sql.plugins.oracle.sessioninfo.NewSessionInfoWorksheetAction;
import net.sourceforge.squirrel_sql.plugins.oracle.sqlloader.control.GenerateControlFileAction;
+import net.sourceforge.squirrel_sql.plugins.oracle.tab.ConstraintColumnInfoTab;
+import net.sourceforge.squirrel_sql.plugins.oracle.tab.ConstraintDetailsTab;
+import net.sourceforge.squirrel_sql.plugins.oracle.tab.ConstraintSourceTab;
import net.sourceforge.squirrel_sql.plugins.oracle.tab.IndexColumnInfoTab;
import net.sourceforge.squirrel_sql.plugins.oracle.tab.IndexDetailsTab;
import net.sourceforge.squirrel_sql.plugins.oracle.tab.InstanceDetailsTab;
@@ -790,7 +794,8 @@
addDetailTab(objTree, DatabaseObjectType.TRIGGER, new DatabaseObjectInfoTab());
addDetailTab(objTree, IObjectTypes.TRIGGER_PARENT, new DatabaseObjectInfoTab());
addDetailTab(objTree, IObjectTypes.TYPE, new DatabaseObjectInfoTab());
-
+ addDetailTab(objTree, IObjectTypes.CONSTRAINT, new DatabaseObjectInfoTab());
+
// Expanders.
addExpander(objTree, DatabaseObjectType.SCHEMA, new SchemaExpander());
addExpander(objTree, DatabaseObjectType.TABLE, new TableExpander());
@@ -799,6 +804,7 @@
addExpander(objTree, IObjectTypes.SESSION_PARENT, new SessionParentExpander());
addExpander(objTree, IObjectTypes.INSTANCE_PARENT, new InstanceParentExpander());
addExpander(objTree, IObjectTypes.TRIGGER_PARENT, new TriggerParentExpander());
+ addExpander(objTree, IObjectTypes.CONSTRAINT_PARENT, new ConstraintParentExpander());
addDetailTab(objTree, DatabaseObjectType.PROCEDURE, new ObjectSourceTab(
"PROCEDURE", "Show stored procedure source"));
@@ -810,6 +816,7 @@
"PACKAGE BODY", "Body", "Show package body"));
addDetailTab(objTree, IObjectTypes.TYPE, new ObjectSourceTab(
"TYPE", "Specification", "Show type specification"));
+
addDetailTab(objTree, IObjectTypes.TYPE, new ObjectSourceTab("TYPE BODY", "Body", "Show type body"));
addDetailTab(objTree, IObjectTypes.INSTANCE, new InstanceDetailsTab());
addDetailTab(objTree, DatabaseObjectType.SEQUENCE, new SequenceDetailsTab());
@@ -819,7 +826,10 @@
addDetailTab(objTree, DatabaseObjectType.TRIGGER, new TriggerSourceTab());
addDetailTab(objTree, DatabaseObjectType.TRIGGER, new TriggerColumnInfoTab());
addDetailTab(objTree, DatabaseObjectType.USER, new UserDetailsTab(session));
-
+ addDetailTab(objTree, IObjectTypes.CONSTRAINT, new ConstraintDetailsTab());
+ addDetailTab(objTree, IObjectTypes.CONSTRAINT, new ConstraintColumnInfoTab());
+ addDetailTab(objTree, IObjectTypes.CONSTRAINT, new ConstraintSourceTab());
+
addDetailTab(objTree, DatabaseObjectType.VIEW, new ViewSourceTab());
addDetailTab(objTree, DatabaseObjectType.TABLE, new SnapshotSourceTab());
Added: trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/AbstractConstraintSource.java
===================================================================
--- trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/AbstractConstraintSource.java (rev 0)
+++ trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/AbstractConstraintSource.java 2010-08-21 14:17:41 UTC (rev 5803)
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2010 Bogdan Cristian Paulon
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.plugins.oracle.constraint;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities;
+
+/**
+ * Base class that constructs the SQL source for the constraints
+ * @author bpaulon
+ */
+public abstract class AbstractConstraintSource {
+
+ String dropStmt;
+ String addStmt;
+ String constraintClause;
+ List<ConstraintColumnInfo> columns;
+
+ ConstraintInfo ci;
+ ISession session;
+
+ public AbstractConstraintSource(ISession session, ConstraintInfo ci) {
+ if (session == null) {
+ throw new IllegalStateException("Null ISession");
+ }
+ if (ci == null) {
+ throw new IllegalStateException("Null ConstraintInfo");
+ }
+
+ this.session = session;
+ this.ci = ci;
+ }
+
+ private final String SQL_COLUMNS = "select "
+ + " owner, constraint_name, table_name, column_name, position"
+ + " from all_cons_columns "
+ + " where owner = ? and constraint_name = ? "
+ + " order by position";
+
+ public void buildDropStatement() {
+ dropStmt = "ALTER TABLE " + ci.getOwner() + "." + ci.getTableName()
+ + "\n DROP CONSTRAINT " + ci.getConstraintName();
+ }
+
+ public void buildAddStatement() {
+ addStmt = "ALTER TABLE " + ci.getOwner() + "." + ci.getTableName()
+ + " ADD";
+ }
+
+ protected String columnNamesAsCSV(List<ConstraintColumnInfo> cols) {
+ StringBuffer ret = new StringBuffer();
+ boolean first = true;
+ for (ConstraintColumnInfo column : cols) {
+ if (!first) {
+ ret.append(", ");
+ } else {
+ first = false;
+ }
+ ret.append(column.getColumnName());
+ }
+ return ret.toString();
+ }
+
+ public void readConstraintColumnNames() throws SQLException {
+ columns = readConstraintColumns(ci.getOwner(),
+ ci.getConstraintName());
+ }
+
+ protected List<ConstraintColumnInfo> readConstraintColumns(String schema,
+ String constraintName)
+ throws SQLException {
+ List<ConstraintColumnInfo> columns = null;
+
+ PreparedStatement pstmt = null;
+ ResultSet rs = null;
+
+ try {
+ pstmt = session.getSQLConnection().prepareStatement(SQL_COLUMNS);
+ pstmt.setString(1, schema);
+ pstmt.setString(2, constraintName);
+
+ columns = new ArrayList<ConstraintColumnInfo>();
+ rs = pstmt.executeQuery();
+ while (rs.next()) {
+ columns.add(new ConstraintColumnInfo(rs.getString(1),
+ rs.getString(2),
+ rs.getString(3),
+ rs.getString(4),
+ rs.getInt(5))
+ );
+ }
+ } finally {
+ SQLUtilities.closeResultSet(rs, true);
+ }
+
+ return columns;
+ }
+
+ public abstract void buildConstraintClause() throws Exception ;
+
+ public String getSource() {
+ return dropStmt + ";\n\n" + addStmt + " (\n" + constraintClause + ");";
+ }
+}
Added: trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/CKConstraintSource.java
===================================================================
--- trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/CKConstraintSource.java (rev 0)
+++ trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/CKConstraintSource.java 2010-08-21 14:17:41 UTC (rev 5803)
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2010 Bogdan Cristian Paulon
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.plugins.oracle.constraint;
+
+import java.sql.SQLException;
+
+import net.sourceforge.squirrel_sql.client.session.ISession;
+
+/**
+ * Class that creates the SQL source for a check constraint.
+ *
+ * @author bpaulon
+ */
+public class CKConstraintSource extends AbstractConstraintSource {
+
+ private AbstractConstraintSource cs;
+
+ /*
+ * Creates the SQL for the not null constraint
+ * The not null constraint is used to specify that a column may never
+ * contain a NULL value.
+ */
+ private class NotNullCKConstraintSource extends AbstractConstraintSource {
+
+ public NotNullCKConstraintSource(ISession session, ConstraintInfo ci) {
+ super(session, ci);
+ }
+
+ @Override
+ public void buildDropStatement() {
+ // ALTER TABLE <SCHEMA>.<CONSTRAINT_NAME> MODIFY NULL
+ //
+ // The check constraint defined on a table must refer to only columns
+ // in that table. It can not refer to columns in other tables.
+ dropStmt = "ALTER TABLE " + ci.getOwner() + "." + ci.getTableName()
+ + "\n MODIFY "
+ + CKConstraintSource.this.columns.get(0).getColumnName()
+ + " NULL";
+ }
+
+ @Override
+ public void buildAddStatement() {
+ // ALTER TABLE <SCHEMA>.<CONSTRAINT_NAME> MODIFY NOT NULL
+ addStmt = "ALTER TABLE " + ci.getOwner() + "." + ci.getTableName()
+ + "\n MODIFY "
+ + CKConstraintSource.this.columns.get(0).getColumnName()
+ + " NOT NULL";
+ }
+
+ @Override
+ public void buildConstraintClause() {
+ // NOP
+ }
+
+ @Override
+ public String getSource() {
+ return dropStmt + ";\n\n" + addStmt + ";";
+ }
+ }
+
+ public CKConstraintSource(ISession session, ConstraintInfo ci) {
+ super(session, ci);
+ }
+
+ public CKConstraintSource(ISession session, ConstraintInfo ci,
+ AbstractConstraintSource cs) {
+ super(session, ci);
+ this.cs = cs;
+ }
+
+ @Override
+ public void readConstraintColumnNames() throws SQLException {
+ super.readConstraintColumnNames();
+
+ if ("GENERATED NAME".equals(ci.getGenerated()) && isNotNullConstraint()) {
+ // use a NOT NULL policy
+ cs = new NotNullCKConstraintSource(session, ci);
+ } else {
+ // use a CHECK policy
+ cs = new AbstractConstraintSource(session, ci) {
+
+ @Override
+ public void buildConstraintClause() {
+ constraintClause = "CONSTRAINT " + ci.getConstraintName()
+ + "\n CHECK ( " + ci.getSearchCondition() + " )";
+ }
+ };
+ }
+ }
+
+ @Override
+ public void buildDropStatement() {
+ cs.buildDropStatement();
+ }
+
+ @Override
+ public void buildAddStatement() {
+ cs.buildAddStatement();
+ }
+
+ @Override
+ public void buildConstraintClause() throws Exception {
+ cs.buildConstraintClause();
+ }
+
+ @Override
+ public String getSource() {
+ return cs.getSource();
+ }
+
+ private boolean isNotNullConstraint() {
+ String expectedSearchCondition = "\""
+ + columns.get(0).getColumnName()
+ + "\""
+ + " IS NOT NULL";
+ if (expectedSearchCondition.equals(ci.getSearchCondition())) {
+ return true;
+ }
+ return false;
+ }
+}
Added: trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/ConstraintColumnInfo.java
===================================================================
--- trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/ConstraintColumnInfo.java (rev 0)
+++ trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/ConstraintColumnInfo.java 2010-08-21 14:17:41 UTC (rev 5803)
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2010 Bogdan Cristian Paulon
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.plugins.oracle.constraint;
+
+/**
+ * Java bean containing connection constraint column information.
+ *
+ * @author bpaulon
+ */
+public class ConstraintColumnInfo {
+ private String owner;
+ private String constraintName;
+ private String tableName;
+ private String columnName;
+ private int position;
+
+ public ConstraintColumnInfo(String owner,
+ String constraintName,
+ String tableName,
+ String columnName,
+ int position)
+ {
+ this.owner = owner;
+ this.constraintName = constraintName;
+ this.tableName = tableName;
+ this.columnName = columnName;
+ this.position = position;
+ }
+
+ public String getOwner() {
+ return owner;
+ }
+ public String getConstraintName() {
+ return constraintName;
+ }
+ public String getTableName() {
+ return tableName;
+ }
+ public String getColumnName() {
+ return columnName;
+ }
+ public int getPosition() {
+ return position;
+ }
+}
Added: trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/ConstraintInfo.java
===================================================================
--- trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/ConstraintInfo.java (rev 0)
+++ trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/ConstraintInfo.java 2010-08-21 14:17:41 UTC (rev 5803)
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2010 Bogdan Cristian Paulon
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.plugins.oracle.constraint;
+
+/**
+ * Java bean containing connection constraint information.
+ *
+ * @author bpaulon
+ */
+public class ConstraintInfo {
+ public static enum ConstraintType {
+ P, //primary key
+ U, //unique
+ R, //reference
+ C //check
+ }
+
+ private String owner;
+ private String constraintName;
+ private ConstraintType constraintType;
+ private String tableName;
+ private String searchCondition;
+ private String rOwner;
+ private String rConstraintName;
+ private String deleteRule;
+ private String generated;
+
+ public ConstraintInfo(String owner,
+ String constraintName,
+ ConstraintType constraintType,
+ String tableName,
+ String searchCondition,
+ String rOwner,
+ String rConstraintName,
+ String deleteRule,
+ String generated) {
+
+ this.owner = owner;
+ this.constraintName = constraintName;
+ this.constraintType = constraintType;
+ this.tableName = tableName;
+ this.searchCondition = searchCondition;
+ this.rOwner = rOwner;
+ this.rConstraintName = rConstraintName;
+ this.deleteRule = deleteRule;
+ this.generated = generated;
+ }
+
+ public String getOwner() {
+ return owner;
+ }
+
+ public String getConstraintName() {
+ return constraintName;
+ }
+
+ public ConstraintType getConstraintType() {
+ return constraintType;
+ }
+
+ public String getTableName() {
+ return tableName;
+ }
+
+ public String getSearchCondition() {
+ return searchCondition;
+ }
+
+ public String getROwner() {
+ return rOwner;
+ }
+
+ public String getRConstraintName() {
+ return rConstraintName;
+ }
+
+ public String getDeleteRule() {
+ return deleteRule;
+ }
+
+ public String getGenerated() {
+ return generated;
+ }
+}
Added: trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/ConstraintSourceBuilder.java
===================================================================
--- trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/ConstraintSourceBuilder.java (rev 0)
+++ trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/ConstraintSourceBuilder.java 2010-08-21 14:17:41 UTC (rev 5803)
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2010 Bogdan Cristian Paulon
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.plugins.oracle.constraint;
+
+/**
+ * Create a source of type @link AbstractConstraintSource
+ * and calls the necessary steps to construct the SQL source
+ * (see @link buildConstraintSource)
+ *
+ * @author bpaulon
+ */
+import java.sql.SQLException;
+
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.plugins.oracle.constraint.ConstraintInfo.ConstraintType;
+
+public class ConstraintSourceBuilder {
+
+ AbstractConstraintSource constraintSource;
+ ISession session;
+
+ public ConstraintSourceBuilder (ISession session) {
+ this.session = session;
+ }
+
+ public String getConstraintSource() {
+ if(constraintSource != null) {
+ return constraintSource.getSource();
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * Does not handle the following oracle constraints
+ * - Read Only Constraint - Type O
+ * Read Only on a view
+ * - Check Option - Type V
+ * Specify WITH CHECK OPTION to indicate that Oracle prohibits
+ * any changes to the table or view that would produce rows that
+ * are not included in the subquery
+ * @param ci - constraint info java bean
+ * @throws SQLException
+ */
+ public void buildConstraintSource(ConstraintInfo ci)
+ throws Exception {
+
+ if (ci.getConstraintType() == ConstraintType.P) {
+ this.constraintSource = new PKConstraintSource(session, ci);
+ } else if (ci.getConstraintType() == ConstraintType.C) {
+ this.constraintSource = new CKConstraintSource(session, ci);
+ } else if (ci.getConstraintType() == ConstraintType.R) {
+ this.constraintSource = new FKConstraintSource(session, ci);
+ } else if (ci.getConstraintType() == ConstraintType.U) {
+ this.constraintSource = new UQConstraintSource(session, ci);
+ }
+
+ constraintSource.readConstraintColumnNames();
+ constraintSource.buildDropStatement();
+ constraintSource.buildAddStatement();
+ constraintSource.buildConstraintClause();
+ }
+}
Added: trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/FKConstraintSource.java
===================================================================
--- trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/FKConstraintSource.java (rev 0)
+++ trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/FKConstraintSource.java 2010-08-21 14:17:41 UTC (rev 5803)
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2010 Bogdan Cristian Paulon
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.plugins.oracle.constraint;
+
+import java.util.List;
+
+import net.sourceforge.squirrel_sql.client.session.ISession;
+
+/**
+ * Class that creates the SQL source for a foreign key constraint.
+ *
+ * @author bpaulon
+ */
+public class FKConstraintSource extends AbstractConstraintSource {
+
+ public FKConstraintSource(ISession session, ConstraintInfo ci) {
+ super(session, ci);
+ }
+
+ private String createReferencesClause() throws Exception {
+ List<ConstraintColumnInfo> cols = readConstraintColumns(ci.getROwner(),
+ ci.getRConstraintName());
+ String colsString = columnNamesAsCSV(cols);
+
+ // all columns belong to the same table
+ String clause = "REFERENCES " + ci.getROwner() + "."
+ + cols.get(0).getTableName()
+ + " ( " + colsString + " )";
+ return clause;
+ }
+
+ protected String buildDeleteClause() {
+ String clause = null;
+ if (!"NO ACTION".equals(ci.getDeleteRule())) {
+ clause = "ON DELETE " + ci.getDeleteRule();
+ }
+ return clause;
+ }
+
+ @Override
+ public void buildConstraintClause() throws Exception {
+ // CONSTRAINT <CONSTRAINT_NAME>
+ // FOREIGN KEY (<COLUMN_01>, <COLUMN_02>)
+ // REFERENCES GENESI_TO.BERSAGLI (<RCOLUMN_01>,<RCOLUMN_02>)
+ // ON DELETE <DELETE_RULE>);
+
+ constraintClause = "CONSTRAINT " + ci.getConstraintName()
+ + " FOREIGN KEY ( " + columnNamesAsCSV(columns) + " ) \n";
+ constraintClause += createReferencesClause();
+
+ String deleteClause = buildDeleteClause();
+ if(deleteClause != null) {
+ constraintClause += " \n " + buildDeleteClause();
+ }
+ }
+}
Added: trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/PKConstraintSource.java
===================================================================
--- trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/PKConstraintSource.java (rev 0)
+++ trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/PKConstraintSource.java 2010-08-21 14:17:41 UTC (rev 5803)
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2010 Bogdan Cristian Paulon
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.plugins.oracle.constraint;
+
+import net.sourceforge.squirrel_sql.client.session.ISession;
+
+/**
+ * Class that creates the SQL source for a primary key constraint.
+ *
+ * @author bpaulon
+ */
+public class PKConstraintSource extends AbstractConstraintSource {
+
+ public PKConstraintSource(ISession session, ConstraintInfo ci) {
+ super(session, ci);
+ }
+
+ @Override
+ public void buildConstraintClause() throws Exception {
+ // CONSTRAINT + <CONSTRAINT_NAME>
+ // PRIMARY KEY
+ // (COLUMN1, COLUMN2, COLUMN3);
+
+ constraintClause = "CONSTRAINT " + ci.getConstraintName()
+ + " PRIMARY KEY ( " + columnNamesAsCSV(columns) + " )";
+ }
+}
Added: trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/UQConstraintSource.java
===================================================================
--- trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/UQConstraintSource.java (rev 0)
+++ trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/constraint/UQConstraintSource.java 2010-08-21 14:17:41 UTC (rev 5803)
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2010 Bogdan Cristian Paulon
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.plugins.oracle.constraint;
+
+import net.sourceforge.squirrel_sql.client.session.ISession;
+
+/**
+ * Constructs the SQL source for a unique constraint.
+ * Unique constraint is used to ensure that all column values
+ * within a table never contain a duplicate entry.
+ *
+ * @author bpaulon
+ */
+public class UQConstraintSource extends AbstractConstraintSource {
+
+ public UQConstraintSource(ISession session, ConstraintInfo ci) {
+ super(session, ci);
+ }
+
+ @Override
+ public void buildConstraintClause() throws Exception {
+ // CONSTRAINT <CONSTRAINT_NAME>
+ // UNIQUE (<COLUMN_01>, <COLUMN_02>, <COLUMN_03>)
+ constraintClause = "CONSTRAINT " + ci.getConstraintName()
+ + " UNIQUE ( " + columnNamesAsCSV(columns) + " ) \n";
+ }
+}
\ No newline at end of file
Added: trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentExpander.java
===================================================================
--- trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentExpander.java (rev 0)
+++ trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentExpander.java 2010-08-21 14:17:41 UTC (rev 5803)
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2010 Bogdan Cristian Paulon
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.plugins.oracle.expander;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.INodeExpander;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreeNode;
+import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
+import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
+import net.sourceforge.squirrel_sql.plugins.oracle.IObjectTypes;
+
+/**
+ * This class handles the expanding of the Constraint node. It will
+ * show all the constraints for selected table.
+ *
+ * @author bpaulon
+ */
+public class ConstraintParentExpander implements INodeExpander {
+
+ private static String SQL = "select constraint_name"
+ + " from all_constraints"
+ + " where owner = ?"
+ + " and table_name = ?"
+ + " order by constraint_name asc";
+
+ public ConstraintParentExpander() {
+ super();
+ }
+
+ public List<ObjectTreeNode> createChildren(ISession session, ObjectTreeNode parentNode)
+ throws SQLException {
+
+ final List<ObjectTreeNode> childNodes = new ArrayList<ObjectTreeNode>();
+ final IDatabaseObjectInfo parentDbinfo = parentNode.getDatabaseObjectInfo();
+ final ISQLConnection conn = session.getSQLConnection();
+ final SQLDatabaseMetaData md = session.getSQLConnection().getSQLMetaData();
+ final IDatabaseObjectInfo tableInfo = ((ConstraintParentInfo)parentDbinfo).getTableInfo();
+ final String schemaName = parentDbinfo.getSchemaName();
+ final PreparedStatement pstmt = conn.prepareStatement(SQL);
+
+ try {
+ pstmt.setString(1, tableInfo.getSchemaName());
+ pstmt.setString(2, tableInfo.getSimpleName());
+ ResultSet rs = pstmt.executeQuery();
+ try {
+ while (rs.next()) {
+ DatabaseObjectInfo doi = new DatabaseObjectInfo(null,
+ schemaName,
+ rs.getString(1),
+ IObjectTypes.CONSTRAINT,
+ md);
+ childNodes.add(new ObjectTreeNode(session, doi));
+ }
+ } finally {
+ rs.close();
+ }
+ } finally {
+ pstmt.close();
+ }
+
+ return childNodes;
+ }
+}
\ No newline at end of file
Added: trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentInfo.java
===================================================================
--- trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentInfo.java (rev 0)
+++ trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentInfo.java 2010-08-21 14:17:41 UTC (rev 5803)
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2010 Bogdan Cristian Paulon
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.plugins.oracle.expander;
+
+/**
+ * Stores information about an Oracle Constraint parent
+ *
+ * @author bpaulon
+ */
+import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
+import net.sourceforge.squirrel_sql.plugins.oracle.IObjectTypes;
+
+public class ConstraintParentInfo extends DatabaseObjectInfo
+{
+ private static final long serialVersionUID = 1L;
+
+ private final IDatabaseObjectInfo _tableInfo;
+
+ public ConstraintParentInfo(IDatabaseObjectInfo tableInfo, String schema,
+ SQLDatabaseMetaData md)
+ {
+ super(null, schema, "CONSTRAINT", IObjectTypes.CONSTRAINT_PARENT, md);
+ _tableInfo = tableInfo;
+ }
+
+ public IDatabaseObjectInfo getTableInfo()
+ {
+ return _tableInfo;
+ }
+}
Modified: trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/expander/TableExpander.java
===================================================================
--- trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/expander/TableExpander.java 2010-08-21 12:29:59 UTC (rev 5802)
+++ trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/expander/TableExpander.java 2010-08-21 14:17:41 UTC (rev 5803)
@@ -61,9 +61,16 @@
IDatabaseObjectInfo dbinfo = new TriggerParentInfo(parentDbinfo,
schemaName, md);
+
ObjectTreeNode child = new ObjectTreeNode(session, dbinfo);
childNodes.add(child);
-
+
+ IDatabaseObjectInfo cstrinfo = new ConstraintParentInfo(parentDbinfo,
+ schemaName, md);
+
+ child = new ObjectTreeNode(session, cstrinfo);
+ childNodes.add(child);
+
return childNodes;
}
}
Added: trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/tab/ConstraintColumnInfoTab.java
===================================================================
--- trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/tab/ConstraintColumnInfoTab.java (rev 0)
+++ trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/tab/ConstraintColumnInfoTab.java 2010-08-21 14:17:41 UTC (rev 5803)
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2010 Bogdan Cristian Paulon
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.plugins.oracle.tab;
+
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BasePreparedStatementTab;
+import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
+/**
+ * This tab displays the column information for the constraint
+ *
+ * @author bpaulon
+ */
+public class ConstraintColumnInfoTab extends BasePreparedStatementTab {
+
+ private static final StringManager s_stringMgr = StringManagerFactory
+ .getStringManager(ConstraintDetailsTab.class);
+
+ private interface i18n {
+ // i18n[oracle.constraintColumns=Columns]
+ String TITLE = s_stringMgr.getString("oracle.constraintColumns");
+ // i18n[oracle.displayConstraintColumns=Display constraint column
+ // information]
+ String HINT = s_stringMgr.getString("oracle.displayConstraintColumns");
+ }
+
+ /*
+ * SQL that retrieves the information from view ALL_CONS_COLUMNS -
+ * ALL_CONS_COLUMNS describes only those columns accessible to current user
+ * that are specified in constraints.
+ */
+ private static String SQL = "select column_name, position"
+ + " from sys.all_cons_columns where owner = ?"
+ + " and constraint_name = ?";
+
+ public ConstraintColumnInfoTab() {
+ super(i18n.TITLE, i18n.HINT);
+ }
+
+ @Override
+ protected PreparedStatement createStatement() throws SQLException {
+ ISession session = getSession();
+ PreparedStatement pstmt = session.getSQLConnection().prepareStatement(
+ SQL);
+ IDatabaseObjectInfo doi = getDatabaseObjectInfo();
+ pstmt.setString(1, doi.getSchemaName());
+ pstmt.setString(2, doi.getSimpleName());
+ return pstmt;
+ }
+}
Added: trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/tab/ConstraintDetailsTab.java
===================================================================
--- trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/tab/ConstraintDetailsTab.java (rev 0)
+++ trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/tab/ConstraintDetailsTab.java 2010-08-21 14:17:41 UTC (rev 5803)
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2010 Bogdan Cristian Paulon
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.plugins.oracle.tab;
+
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BasePreparedStatementTab;
+import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
+/**
+ * This tab displays the details for the constraint
+ *
+ * @author bpaulon
+ */
+public class ConstraintDetailsTab extends BasePreparedStatementTab {
+
+ private static final StringManager s_stringMgr = StringManagerFactory
+ .getStringManager(ConstraintDetailsTab.class);
+
+ private interface i18n {
+ // i18n[oracle.constraintDetails=Details]
+ String TITLE = s_stringMgr.getString("oracle.constraintDetails");
+ // i18n[oracle.displayConstraintDetails=Display constraint details]
+ String HINT = s_stringMgr.getString("oracle.displayConstraintDetails");
+ }
+
+ /*
+ * SQL that retrieves the information from ALL_CONSTRAINTS - ALL_CONSTRAINTS
+ * describes constraint definitions on tables accessible to the current
+ * user.
+ */
+ private static String SQL = "select"
+ + " c.owner, c.constraint_name, c.constraint_type,"
+ + " c.table_name, c.search_condition, c.r_owner,"
+ + " c.r_constraint_name, c.delete_rule,"
+ + " c.status, c.deferrable, c.deferred,"
+ + " c.validated, c.generated, c.bad,"
+ + " c.rely, c.last_change, c.index_owner,"
+ + " c.index_name, c.invalid, c.view_related"
+ + " from sys.all_constraints c " + " where c.owner = ?"
+ + " and c.constraint_name = ?";
+
+ public ConstraintDetailsTab() {
+ super(i18n.TITLE, i18n.HINT, true);
+ }
+
+ protected PreparedStatement createStatement() throws SQLException {
+ ISession session = getSession();
+ PreparedStatement pstmt = session.getSQLConnection().prepareStatement(
+ SQL);
+ IDatabaseObjectInfo doi = getDatabaseObjectInfo();
+ pstmt.setString(1, doi.getSchemaName());
+ pstmt.setString(2, doi.getSimpleName());
+ return pstmt;
+ }
+}
Added: trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/tab/ConstraintSourceTab.java
===================================================================
--- trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/tab/ConstraintSourceTab.java (rev 0)
+++ trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/tab/ConstraintSourceTab.java 2010-08-21 14:17:41 UTC (rev 5803)
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2010 Bogdan Cristian Paulon
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package net.sourceforge.squirrel_sql.plugins.oracle.tab;
+
+import java.awt.BorderLayout;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import javax.swing.JTextArea;
+
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourcePanel;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab;
+import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
+import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
+import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+import net.sourceforge.squirrel_sql.plugins.oracle.constraint.ConstraintInfo;
+import net.sourceforge.squirrel_sql.plugins.oracle.constraint.ConstraintSourceBuilder;
+
+/**
+ * This tab displays the source for the constraint
+ *
+ * @author bpaulon
+ */
+public class ConstraintSourceTab extends BaseSourceTab {
+
+ /** Internationalized strings for this class. */
+ private static final StringManager s_stringMgr = StringManagerFactory
+ .getStringManager(TriggerSourceTab.class);
+
+ /** Logger for this class. */
+ private final static ILogger s_log = LoggerController
+ .createLogger(BaseSourceTab.class);
+
+ /**
+ * SQL that retrieves the data we need to build the source for this
+ * constraint
+ */
+ private static String SQL = "select owner, constraint_name,"
+ + " constraint_type, table_name, search_condition, r_owner,"
+ + " r_constraint_name, delete_rule, generated"
+ + " from all_constraints"
+ + " where owner = ? and constraint_name = ?";
+
+ public ConstraintSourceTab() {
+ // i18n[oracle.showConstraintSource=Show constraint source]
+ super(s_stringMgr.getString("oracle.showConstraintSource"));
+ super.setSourcePanel(new ConstraintSourcePanel());
+ }
+
+ @Override
+ protected PreparedStatement createStatement() throws SQLException {
+ final ISession session = getSession();
+ final IDatabaseObjectInfo doi = getDatabaseObjectInfo();
+
+ ISQLConnection conn = session.getSQLConnection();
+ PreparedStatement pstmt = conn.prepareStatement(SQL);
+ pstmt.setString(1, doi.getSchemaName());
+ pstmt.setString(2, doi.getSimpleName());
+ return pstmt;
+ }
+
+ /**
+ * The panel that displays the source code for the constraint
+ */
+ private final class ConstraintSourcePanel extends BaseSourcePanel {
+ private static final long serialVersionUID = 1L;
+
+ private JTextArea textArea;
+
+ ConstraintSourcePanel() {
+ super(new BorderLayout());
+ textArea = new JTextArea();
+ textArea.setEditable(false);
+ add(textArea, BorderLayout.CENTER);
+ }
+
+ public void load(ISession session, PreparedStatement stmt) {
+ // always wrap on word boundaries
+ textArea.setWrapStyleWord(true);
+ ConstraintSourceBuilder csb = new ConstraintSourceBuilder(session);
+
+ ResultSet rs = null;
+ try {
+ rs = stmt.executeQuery();
+
+ if (rs.next()) {
+ ConstraintInfo ci = new ConstraintInfo(
+ rs.getString(1),
+ rs.getString(2),
+ ConstraintInfo.ConstraintType
+ .valueOf(rs.getString(3)),
+ rs.getString(4),
+ rs.getString(5),
+ rs.getString(6),
+ rs.getString(7),
+ rs.getString(8),
+ rs.getString(9));
+
+ csb.buildConstraintSource(ci);
+
+ if (csb.getConstraintSource() != null) {
+ textArea.setText(csb.getConstraintSource());
+ } else {
+ textArea.setText("Source NOT available");
+ }
+ }
+ } catch (Exception ex) {
+ if (s_log.isDebugEnabled()) {
+ s_log.debug("Unexpected exception while formatting "
+ + "object source code", ex);
+ }
+ session.showErrorMessage(ex);
+ } finally {
+ SQLUtilities.closeResultSet(rs, true);
+ }
+ }
+ }
+}
Modified: trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/tab/I18NStrings.properties
===================================================================
--- trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/tab/I18NStrings.properties 2010-08-21 12:29:59 UTC (rev 5802)
+++ trunk/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/tab/I18NStrings.properties 2010-08-21 14:17:41 UTC (rev 5803)
@@ -1,32 +1,32 @@
-oracle.options=Options
+oracle.columns=Columns
+oracle.constraintColumns=Columns
+oracle.constraintDetails=Details
+oracle.details=Details
+oracle.displayColumns=Display index column information
+oracle.displayConstraintColumns=Display constraint column information
+oracle.displayConstraintDetails=Display constraint details
+oracle.displayDetails=Display index details
+oracle.displayLobDetails=Display lob details
oracle.displayOptions=Display database options
-oracle.userDetails=Details
+oracle.diplayScriptDetails=Display script details
+oracle.displaysSequenceDetails=Display sequence details
+oracle.displaySessionDetails=Display session details
+oracle.displaySessionStatistics=Display database session statistics
+oracle.displaySnapshotDetails=Display materialized view details
+oracle.displaySnstanceDetails=Display instance details
+oracle.displayTriggerColumns=Display trigger column information
+oracle.displayTriggerDetails=Display trigger details
oracle.displayUserDetails=Display User details
oracle.instanceDetails=Details
+oracle.lobDetails=Details
+oracle.options=Options
+oracle.sequenceDetails=Details
+oracle.sessionDetails=Details
oracle.sessionStatistics=Session Statistics
-oracle.displaySessionStatistics=Display database session statistics
+oracle.showConstraintSource=Show constraint source
oracle.showTriggerSource=Show trigger source
oracle.triggerColumns=Columns
-oracle.displayTriggerColumns=Display trigger column information
-oracle.sessionDetails=Details
-oracle.displaySessionDetails=Display session details
-oracle.details=Details
-oracle.displayDetails=Display index details
-oracle.sequenceDetails=Details
-oracle.displaysSequenceDetails=Display sequence details
oracle.triggerDetails=Details
-oracle.displayTriggerDetails=Display trigger details
-oracle.lobDetails=Details
-oracle.displayLobDetails=Display lob details
-oracle.diplayScriptDetails=Display script details
-oracle.displaySnapshotDetails=Display materialized view details
-oracle.columns=Columns
-oracle.displayColumns=Display index column information
+oracle.userDetails=Details
-#
-#Missing/changed properties generated by I18n Plugin on Sat Oct 29 21:10:25 CEST 2005
-#
-
-# A T T E N T I O N: REPLACES SAME KEY ABOVE
-oracle.displaySnstanceDetails=Display instance details
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-08-21 12:30:06
|
Revision: 5802
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5802&view=rev
Author: manningr
Date: 2010-08-21 12:29:59 +0000 (Sat, 21 Aug 2010)
Log Message:
-----------
use the latest version of the version plugin.
Modified Paths:
--------------
trunk/sql12/pom.xml
Modified: trunk/sql12/pom.xml
===================================================================
--- trunk/sql12/pom.xml 2010-08-21 11:25:55 UTC (rev 5801)
+++ trunk/sql12/pom.xml 2010-08-21 12:29:59 UTC (rev 5802)
@@ -73,7 +73,7 @@
<maven-plugin-api-version>2.0</maven-plugin-api-version>
<pmd-plugin-version>2.4</pmd-plugin-version>
<source-plugin-version>2.1</source-plugin-version>
- <squirrelsql-version-plugin-version>1.0.1</squirrelsql-version-plugin-version>
+ <squirrelsql-version-plugin-version>1.0.3</squirrelsql-version-plugin-version>
<squirrelsql-update-site-plugin-version>1.0.1</squirrelsql-update-site-plugin-version>
<surefire-plugin-version>2.5</surefire-plugin-version>
<wagon-plugin-version>1.0-beta-3</wagon-plugin-version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-08-21 11:26:01
|
Revision: 5801
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5801&view=rev
Author: manningr
Date: 2010-08-21 11:25:55 +0000 (Sat, 21 Aug 2010)
Log Message:
-----------
replaced snapshot version id with maven property.
Modified Paths:
--------------
trunk/sql12/installer/squirrelsql-other-installer/pom.xml
Modified: trunk/sql12/installer/squirrelsql-other-installer/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2010-08-21 11:11:34 UTC (rev 5800)
+++ trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2010-08-21 11:25:55 UTC (rev 5801)
@@ -358,7 +358,7 @@
<plugin>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrelsql-version-plugin</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>${squirrelsql-version-plugin-version}</version>
<executions>
<execution>
<phase>initialize</phase>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-08-21 11:11:40
|
Revision: 5800
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5800&view=rev
Author: manningr
Date: 2010-08-21 11:11:34 +0000 (Sat, 21 Aug 2010)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/maven-plugin-workspace/pom.xml
trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml
trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml
Modified: trunk/maven-plugin-workspace/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/pom.xml 2010-08-21 11:11:30 UTC (rev 5799)
+++ trunk/maven-plugin-workspace/pom.xml 2010-08-21 11:11:34 UTC (rev 5800)
@@ -9,7 +9,7 @@
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Maven Plugin Workspace</name>
<description>
@@ -42,9 +42,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.3</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.3</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.3</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/maven-plugin-workspace</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml 2010-08-21 11:11:30 UTC (rev 5799)
+++ trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml 2010-08-21 11:11:34 UTC (rev 5800)
@@ -4,12 +4,12 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
</parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrelsql-update-site-plugin</artifactId>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>SQuirreLSQL Update Site Maven Mojo</name>
@@ -47,9 +47,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.3/maven-plugin-workspace-1.0.2</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.3/maven-plugin-workspace-1.0.2</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.3/maven-plugin-workspace-1.0.2</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.2</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.2</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.2</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml 2010-08-21 11:11:30 UTC (rev 5799)
+++ trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml 2010-08-21 11:11:34 UTC (rev 5800)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
</parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrelsql-version-plugin</artifactId>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>SQuirreLSQL Version Maven Mojo</name>
<description>
@@ -45,9 +45,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.3/maven-plugin-workspace-1.0.2</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.3/maven-plugin-workspace-1.0.2</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.3/maven-plugin-workspace-1.0.2</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.2</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.2</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.2</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-08-21 11:11:36
|
Revision: 5799
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5799&view=rev
Author: manningr
Date: 2010-08-21 11:11:30 +0000 (Sat, 21 Aug 2010)
Log Message:
-----------
[maven-release-plugin] copy for tag maven-plugin-workspace-1.0.3
Added Paths:
-----------
tags/maven-plugin-workspace-1.0.3/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-08-21 11:11:28
|
Revision: 5798
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5798&view=rev
Author: manningr
Date: 2010-08-21 11:11:22 +0000 (Sat, 21 Aug 2010)
Log Message:
-----------
[maven-release-plugin] prepare release maven-plugin-workspace-1.0.3
Modified Paths:
--------------
trunk/maven-plugin-workspace/pom.xml
trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml
trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml
Modified: trunk/maven-plugin-workspace/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/pom.xml 2010-08-21 11:06:08 UTC (rev 5797)
+++ trunk/maven-plugin-workspace/pom.xml 2010-08-21 11:11:22 UTC (rev 5798)
@@ -9,7 +9,7 @@
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.3</version>
<packaging>pom</packaging>
<name>Maven Plugin Workspace</name>
<description>
@@ -42,9 +42,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/maven-plugin-workspace</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.3</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.3</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.3</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml 2010-08-21 11:06:08 UTC (rev 5797)
+++ trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml 2010-08-21 11:11:22 UTC (rev 5798)
@@ -4,12 +4,12 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.3</version>
</parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrelsql-update-site-plugin</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.3</version>
<packaging>maven-plugin</packaging>
<name>SQuirreLSQL Update Site Maven Mojo</name>
@@ -47,9 +47,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.2</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.2</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.2</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.3/maven-plugin-workspace-1.0.2</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.3/maven-plugin-workspace-1.0.2</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.3/maven-plugin-workspace-1.0.2</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml 2010-08-21 11:06:08 UTC (rev 5797)
+++ trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml 2010-08-21 11:11:22 UTC (rev 5798)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.3</version>
</parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrelsql-version-plugin</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.3</version>
<packaging>maven-plugin</packaging>
<name>SQuirreLSQL Version Maven Mojo</name>
<description>
@@ -45,9 +45,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.2</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.2</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.2</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.3/maven-plugin-workspace-1.0.2</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.3/maven-plugin-workspace-1.0.2</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.3/maven-plugin-workspace-1.0.2</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-08-21 11:06:14
|
Revision: 5797
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5797&view=rev
Author: manningr
Date: 2010-08-21 11:06:08 +0000 (Sat, 21 Aug 2010)
Log Message:
-----------
update version for next release.
Modified Paths:
--------------
trunk/maven-plugin-workspace/pom.xml
trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml
trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml
Modified: trunk/maven-plugin-workspace/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/pom.xml 2010-08-20 23:10:40 UTC (rev 5796)
+++ trunk/maven-plugin-workspace/pom.xml 2010-08-21 11:06:08 UTC (rev 5797)
@@ -9,7 +9,7 @@
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Maven Plugin Workspace</name>
<description>
Modified: trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml 2010-08-20 23:10:40 UTC (rev 5796)
+++ trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml 2010-08-21 11:06:08 UTC (rev 5797)
@@ -4,12 +4,12 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
</parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrelsql-update-site-plugin</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>SQuirreLSQL Update Site Maven Mojo</name>
Modified: trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml 2010-08-20 23:10:40 UTC (rev 5796)
+++ trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml 2010-08-21 11:06:08 UTC (rev 5797)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
</parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrelsql-version-plugin</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>SQuirreLSQL Version Maven Mojo</name>
<description>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-08-20 23:10:46
|
Revision: 5796
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5796&view=rev
Author: manningr
Date: 2010-08-20 23:10:40 +0000 (Fri, 20 Aug 2010)
Log Message:
-----------
Switched to using sonatype parent pom.
Modified Paths:
--------------
trunk/maven-plugin-workspace/pom.xml
Modified: trunk/maven-plugin-workspace/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/pom.xml 2010-08-20 22:56:00 UTC (rev 5795)
+++ trunk/maven-plugin-workspace/pom.xml 2010-08-20 23:10:40 UTC (rev 5796)
@@ -1,9 +1,16 @@
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.sonatype.oss</groupId>
+ <artifactId>oss-parent</artifactId>
+ <version>3</version>
+ </parent>
+
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.2</version>
- <packaging>pom</packaging>
+ <version>1.0.2-SNAPSHOT</version>
+ <packaging>pom</packaging>
<name>Maven Plugin Workspace</name>
<description>
A place to collect and release maven plugins required or building various SQuirreL
@@ -35,9 +42,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.2</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.2</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.2</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/maven-plugin-workspace</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
@@ -88,16 +95,4 @@
</build>
</profile>
</profiles>
- <distributionManagement>
- <repository>
- <id>sourceforge-releases</id>
- <name>Sourceforge Release Repository</name>
- <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url>
- </repository>
- <snapshotRepository>
- <id>sourceforge-snapshots</id>
- <name>Sourceforge Snapshot Repository</name>
- <url>http://oss.sonatype.org/content/repositories/sourceforge-snapshots</url>
- </snapshotRepository>
- </distributionManagement>
</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.
|
Revision: 5795
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5795&view=rev
Author: manningr
Date: 2010-08-20 22:56:00 +0000 (Fri, 20 Aug 2010)
Log Message:
-----------
Hold onto the rpm version as well. Added an output file for debug purposes, which is currently disabled.
Modified Paths:
--------------
trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java
Modified: trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java 2010-08-15 19:07:29 UTC (rev 5794)
+++ trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java 2010-08-20 22:56:00 UTC (rev 5795)
@@ -19,6 +19,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Properties;
@@ -64,6 +67,9 @@
/** A place to keep the version after it has been generated. */
private static String squirrelsqlVersion = null;
+ /** A place to keep the rpm version after it has been generated from the squirrelsqlVersion */
+ private static String squirrelsqlRpmVersion = null;
+
/**
* The maven project in which this plugin is configured.
*
@@ -92,7 +98,7 @@
* @throws MojoExecutionException
* if the projectVersion isn't specified.
*/
- public void execute() throws MojoExecutionException
+ synchronized public void execute() throws MojoExecutionException
{
// Skip creating a new version if we have already done so in the past.
if (squirrelsqlVersion == null)
@@ -123,8 +129,15 @@
throw e;
}
}
+ // RPM requires that the version string have no dashes. So create a special RPM-safe version of the
+ // version string.
+ squirrelsqlRpmVersion = squirrelsqlVersion.replace('-', '_');
}
+ if (log.isInfoEnabled()) {
+ log.info("squirrelsqlVersion: "+squirrelsqlVersion);
+ }
+
// We set this as a property in the current project where the plugin is configured. This is probably
// unnecessary.
Properties props = project.getProperties();
@@ -134,6 +147,31 @@
// Also a global system property so that this is accessible from any pom as a pom property.
System.setProperty(VERSION_PROPERTY_KEY, squirrelsqlVersion);
System.setProperty(RPM_VERSION_PROPERTY_KEY, squirrelsqlVersion.replace('-', '_'));
+
+ //writeVersionToFile();
}
+
+ private void writeVersionToFile() {
+ File buildDir = new File(project.getBuild().getDirectory());
+ if (!buildDir.exists()) {
+ buildDir.mkdir();
+ }
+ File versionFile = new File(buildDir, "squirrelsql-version-plugin.log");
+ PrintWriter out = null;
+ try {
+ versionFile.createNewFile();
+ out = new PrintWriter(versionFile);
+ SimpleDateFormat sdf = new SimpleDateFormat(TIMESTAMP_PATTERN);
+ out.println(VERSION_PROPERTY_KEY+"="+squirrelsqlVersion);
+ out.println(RPM_VERSION_PROPERTY_KEY+"="+squirrelsqlRpmVersion);
+ out.println("Current Timestamp: "+sdf.format(new Date()));
+ } catch (IOException e) {
+ log.error("Unable to write version ("+squirrelsqlVersion+") to file: "+e.getMessage(), e);
+ } finally {
+ if (out != null) {
+ out.close();
+ }
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-08-15 19:07:34
|
Revision: 5794
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5794&view=rev
Author: manningr
Date: 2010-08-15 19:07:29 +0000 (Sun, 15 Aug 2010)
Log Message:
-----------
Use the version provided by the version plugin.
Modified Paths:
--------------
trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/izpack-mac.xml
Modified: trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/izpack-mac.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/izpack-mac.xml 2010-08-15 19:06:44 UTC (rev 5793)
+++ trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/izpack-mac.xml 2010-08-15 19:07:29 UTC (rev 5794)
@@ -3,7 +3,7 @@
<info>
<appname>SQuirreL SQL Client</appname>
<appsubpath>SQuirreLSQL.app</appsubpath>
- <appversion>${squirrel.version}</appversion>
+ <appversion>${squirrelsql.version}</appversion>
<authors>
<author
email="ger...@us..."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-08-15 19:06:51
|
Revision: 5793
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5793&view=rev
Author: manningr
Date: 2010-08-15 19:06:44 +0000 (Sun, 15 Aug 2010)
Log Message:
-----------
Use the rpm plugin to produce an rpm. Obviously, this requires rpmbuild to be installed, but other than that an rpm system isn't required, unless the rpm installation is to be tested. But that is done manually.
Modified Paths:
--------------
trunk/sql12/installer/squirrelsql-other-installer/pom.xml
Modified: trunk/sql12/installer/squirrelsql-other-installer/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2010-08-15 19:05:29 UTC (rev 5792)
+++ trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2010-08-15 19:06:44 UTC (rev 5793)
@@ -354,6 +354,20 @@
</testResource>
</testResources>
<plugins>
+ <!-- Set the squirrelsql.version property if it has not already been set. -->
+ <plugin>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrelsql-version-plugin</artifactId>
+ <version>1.0.2-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>set-version</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<!-- prepare dependencies so that izpack jar tag to pickup at compile time -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -566,7 +580,146 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rpm-maven-plugin</artifactId>
+ <version>2.1-alpha-1</version>
+ <executions>
+ <execution>
+ <configuration>
+ <version>${squirrelsql.rpm.version}</version>
+ <copyright>LGPL</copyright>
+ <distribution>Red Hat Linux</distribution>
+ <group>Development/Tools</group>
+ <packager>Rob Manning <robert [DOT] m [DOT] manning [AT] gmail.com></packager>
+ <prefix>/opt</prefix>
+ <summary>A database front-end written in Java</summary>
+ <url>http://squirrelsql.org</url>
+ <requires>
+ <require>java-1.6.0-openjdk</require>
+ </requires>
+ <mappings>
+ <mapping>
+ <!--
+ The "/opt" prefix is necessary here. It is where we install by default, when the rpm is installed
+ without being relocated.
+ -->
+ <directory>/opt/SQuirreLSQLClient/doc</directory>
+ <filemode>777</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+ <location>target/squirrel-sql-${squirrelsql.version}-base/doc</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/SQuirreLSQLClient/icons</directory>
+ <filemode>777</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+ <location>target/squirrel-sql-${squirrelsql.version}-base/icons</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/SQuirreLSQLClient/lib</directory>
+ <filemode>777</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+ <location>target/squirrel-sql-${squirrelsql.version}-base/lib</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/SQuirreLSQLClient/plugins</directory>
+ <filemode>777</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+ <location>target/squirrel-sql-${squirrelsql.version}-base/plugins</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/SQuirreLSQLClient</directory>
+ <filemode>777</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+ <location>target/squirrel-sql-${squirrelsql.version}-base/squirrel-sql.sh</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/SQuirreLSQLClient/update</directory>
+ <filemode>777</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+ <location>target/squirrel-sql-${squirrelsql.version}-base/update</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/SQuirreLSQLClient</directory>
+ <filemode>666</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+ <location>target/squirrel-sql-${squirrelsql.version}-base/log4j.properties</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/SQuirreLSQLClient</directory>
+ <filemode>666</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+ <location>target/squirrel-sql-${squirrelsql.version}-base/squirrel-sql.jar</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/SQuirreLSQLClient</directory>
+ <filemode>666</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+ <location>target/squirrel-sql-${squirrelsql.version}-base/update-log4j.properties</location>
+ </source>
+ </sources>
+ </mapping>
+ </mappings>
+ <postinstallScriptlet>
+ <scriptFile>src/main/resources/postinstall.sh</scriptFile>
+ <fileEncoding>utf-8</fileEncoding>
+ </postinstallScriptlet>
+ <postremoveScriptlet>
+ <scriptFile>src/main/resources/postremove.sh</scriptFile>
+ <fileEncoding>utf-8</fileEncoding>
+ </postremoveScriptlet>
+ </configuration>
+ <goals>
+ <goal>rpm</goal>
+ </goals>
+ <phase>post-integration-test</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<profiles>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-08-15 19:05:37
|
Revision: 5792
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5792&view=rev
Author: manningr
Date: 2010-08-15 19:05:29 +0000 (Sun, 15 Aug 2010)
Log Message:
-----------
As part of the batch upload, put the rpm as well.
Modified Paths:
--------------
trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/batch.txt
Modified: trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/batch.txt
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/batch.txt 2010-08-15 19:04:09 UTC (rev 5791)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/batch.txt 2010-08-15 19:05:29 UTC (rev 5792)
@@ -7,3 +7,5 @@
mkdir ${squirrelsql.version}
cd ../${squirrelsql.version}
put target/${project.build.finalName}-standard.jar ${upload-server-path}
+put target/rpm/squirrelsql-other-installer/RPMS/noarch/squirrelsql-other-installer-${squirrelsql.rpm.version}-1.noarch.rpm
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-08-15 19:04:15
|
Revision: 5791
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5791&view=rev
Author: manningr
Date: 2010-08-15 19:04:09 +0000 (Sun, 15 Aug 2010)
Log Message:
-----------
scripts for rpm installation.
Added Paths:
-----------
trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/postinstall.sh
trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/postremove.sh
Added: trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/postinstall.sh
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/postinstall.sh (rev 0)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/postinstall.sh 2010-08-15 19:04:09 UTC (rev 5791)
@@ -0,0 +1,8 @@
+#! /bin/bash
+
+if [ "$RPM_INSTALL_PREFIX" != "" ]; then
+ sed -i "s:/opt:$RPM_INSTALL_PREFIX:g" $RPM_INSTALL_PREFIX/SQuirreLSQLClient/squirrel-sql.sh
+ chmod 777 $RPM_INSTALL_PREFIX/SQuirreLSQLClient
+else
+ chmod 777 /opt/SQuirreLSQLClient
+fi
Added: trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/postremove.sh
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/postremove.sh (rev 0)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/postremove.sh 2010-08-15 19:04:09 UTC (rev 5791)
@@ -0,0 +1,7 @@
+#! /bin/bash
+
+if [ "$RPM_INSTALL_PREFIX" != "" ]; then
+ rm -rf $RPM_INSTALL_PREFIX/SQuirreLSQLClient
+else
+ rm -rf /opt/SQuirreLSQLClient
+fi
\ 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: <man...@us...> - 2010-08-15 19:03:20
|
Revision: 5790
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5790&view=rev
Author: manningr
Date: 2010-08-15 19:03:14 +0000 (Sun, 15 Aug 2010)
Log Message:
-----------
Use the version provided by the version plugin.
Modified Paths:
--------------
trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/izpack-other.xml
Modified: trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/izpack-other.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/izpack-other.xml 2010-08-14 20:31:19 UTC (rev 5789)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/izpack-other.xml 2010-08-15 19:03:14 UTC (rev 5790)
@@ -2,8 +2,8 @@
<info>
<appname>SQuirreL SQL Client</appname>
- <appsubpath>squirrel-sql-${squirrel.version}</appsubpath>
- <appversion>${squirrel.version}</appversion>
+ <appsubpath>squirrel-sql-${squirrelsql.version}</appsubpath>
+ <appversion>${squirrelsql.version}</appversion>
<authors>
<author email="ger...@us..." name="Gerd Wagner" />
<author email="man...@us..." name="Rob Manning" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-08-14 20:31:25
|
Revision: 5789
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5789&view=rev
Author: manningr
Date: 2010-08-14 20:31:19 +0000 (Sat, 14 Aug 2010)
Log Message:
-----------
[maven-release-plugin] prepare release maven-plugin-workspace-1.0.2
Modified Paths:
--------------
trunk/maven-plugin-workspace/pom.xml
trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml
trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml
Modified: trunk/maven-plugin-workspace/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/pom.xml 2010-08-14 20:22:23 UTC (rev 5788)
+++ trunk/maven-plugin-workspace/pom.xml 2010-08-14 20:31:19 UTC (rev 5789)
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.2</version>
<packaging>pom</packaging>
<name>Maven Plugin Workspace</name>
<description>
@@ -35,9 +35,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/maven-plugin-workspace</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.2</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.2</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.2</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml 2010-08-14 20:22:23 UTC (rev 5788)
+++ trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml 2010-08-14 20:31:19 UTC (rev 5789)
@@ -4,12 +4,12 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.2</version>
</parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrelsql-update-site-plugin</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.2</version>
<packaging>maven-plugin</packaging>
<name>SQuirreLSQL Update Site Maven Mojo</name>
@@ -47,9 +47,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/maven-plugin-workspace</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.2</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.2</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.2</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml 2010-08-14 20:22:23 UTC (rev 5788)
+++ trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml 2010-08-14 20:31:19 UTC (rev 5789)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.2</version>
</parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrelsql-version-plugin</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.2</version>
<packaging>maven-plugin</packaging>
<name>SQuirreLSQL Version Maven Mojo</name>
<description>
@@ -45,9 +45,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/maven-plugin-workspace</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.2</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.2</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.2</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 5788
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5788&view=rev
Author: manningr
Date: 2010-08-14 20:22:23 +0000 (Sat, 14 Aug 2010)
Log Message:
-----------
Update to add RPM-safe form of version string which contains no dashes.
Modified Paths:
--------------
trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java
Modified: trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java 2010-08-11 00:10:20 UTC (rev 5787)
+++ trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java 2010-08-14 20:22:23 UTC (rev 5788)
@@ -37,7 +37,9 @@
* form of YYYYMMDD_HHMM. If however, the project version does not end with "-SNAPSHOT", then
* squirrelsql.version will be set to the value of the project version. In case this mojo is configured and
* executed more than once in a build, the squirrelsqlVersion property is set to the value that it was
- * initially set to during the first execution of this plugin.
+ * initially set to during the first execution of this plugin. This mojo will also set a modified form
+ * of the version to a property called "squirrelsql.rpm.version". This property's value is safe to use for
+ * the RPM which requires no dashes in the version string.
*
* @goal set-version
* @phase initialize
@@ -50,12 +52,18 @@
/** This is the property that will be set for use in the pom */
public static String VERSION_PROPERTY_KEY = "squirrelsql.version";
+ /**
+ * This is the property for the rpm version that will be set for use in the pom. RPM doesn't allow
+ * dashes in the version so this is a sanitized form.
+ */
+ public static String RPM_VERSION_PROPERTY_KEY = "squirrelsql.rpm.version";
+
/** The format of the timestamp that follows the prefix SNAPSHOT- in the version string */
public static String TIMESTAMP_PATTERN = "yyyyMMdd_kkmm";
/** A place to keep the version after it has been generated. */
private static String squirrelsqlVersion = null;
-
+
/**
* The maven project in which this plugin is configured.
*
@@ -121,10 +129,11 @@
// unnecessary.
Properties props = project.getProperties();
props.put(VERSION_PROPERTY_KEY, squirrelsqlVersion);
+ props.put(RPM_VERSION_PROPERTY_KEY, squirrelsqlVersion.replace('-', '_'));
// Also a global system property so that this is accessible from any pom as a pom property.
System.setProperty(VERSION_PROPERTY_KEY, squirrelsqlVersion);
-
+ System.setProperty(RPM_VERSION_PROPERTY_KEY, squirrelsqlVersion.replace('-', '_'));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-08-11 00:10:26
|
Revision: 5787
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5787&view=rev
Author: manningr
Date: 2010-08-11 00:10:20 +0000 (Wed, 11 Aug 2010)
Log Message:
-----------
remove unneeded auto install configuration file.
Removed Paths:
-------------
trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/auto-install.xml
Deleted: trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/auto-install.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/auto-install.xml 2010-08-11 00:00:52 UTC (rev 5786)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/auto-install.xml 2010-08-11 00:10:20 UTC (rev 5787)
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<AutomatedInstallation langpack="eng">
-<com.izforge.izpack.panels.HelloPanel id="UNKNOWN (com.izforge.izpack.panels.HelloPanel)"/>
-<com.izforge.izpack.panels.HTMLInfoPanel id="UNKNOWN (com.izforge.izpack.panels.HTMLInfoPanel)"/>
-<com.izforge.izpack.panels.TargetPanel id="UNKNOWN (com.izforge.izpack.panels.TargetPanel)">
-<installpath>${project.build.directory}/squirrel-install-from-maven</installpath>
-</com.izforge.izpack.panels.TargetPanel>
-<com.izforge.izpack.panels.PacksPanel id="UNKNOWN (com.izforge.izpack.panels.PacksPanel)">
-<pack index="0" name="Base" selected="true"/>
-<pack index="1" name="Standard" selected="true"/>
-<pack index="2" name="Optional Plugin - Data import" selected="true"/>
-<pack index="3" name="Optional Plugin - DBCopy" selected="true"/>
-<pack index="4" name="Optional Plugin - DBDiff" selected="true"/>
-<pack index="5" name="Optional Plugin - DB2" selected="true"/>
-<pack index="6" name="Optional Plugin - Derby" selected="true"/>
-<pack index="7" name="Optional Plugin - Firebird " selected="true"/>
-<pack index="8" name="Optional Plugin - Firebird Manager" selected="true"/>
-<pack index="9" name="Optional Plugin - H2 " selected="true"/>
-<pack index="10" name="Optional Plugin - Hibernate " selected="true"/>
-<pack index="11" name="Optional Plugin - Informix " selected="true"/>
-<pack index="12" name="Optional Plugin - Microsoft SQL Server " selected="true"/>
-<pack index="13" name="Optional Plugin - MySQL " selected="true"/>
-<pack index="14" name="Optional Plugin - Netezza" selected="true"/>
-<pack index="15" name="Optional Plugin - Oracle" selected="true"/>
-<pack index="16" name="Optional Plugin - PostgreSQL " selected="true"/>
-<pack index="17" name="Optional Plugin - Refactoring" selected="true"/>
-<pack index="18" name="Optional Plugin - Session Scripts" selected="true"/>
-<pack index="19" name="Optional Plugin - Smart Tools " selected="true"/>
-<pack index="20" name="Optional Plugin - SQL Parametrisation " selected="true"/>
-<pack index="21" name="Optional Plugin - SQL Replace " selected="true"/>
-<pack index="22" name="Optional Plugin - SQL Validator " selected="true"/>
-<pack index="23" name="Optional Plugin - Sybase " selected="true"/>
-<pack index="24" name="Optional Plugin - Internationalization " selected="true"/>
-<pack index="25" name="Optional Translation - Brazilian Portuguese" selected="true"/>
-<pack index="26" name="Optional Translation - Bulgarian" selected="true"/>
-<pack index="27" name="Optional Translation - Czech" selected="true"/>
-<pack index="28" name="Optional Translation - Simplified Chinese" selected="true"/>
-<pack index="29" name="Optional Translation - French" selected="true"/>
-<pack index="30" name="Optional Translation - German" selected="true"/>
-<pack index="31" name="Optional Translation - Italian" selected="true"/>
-<pack index="32" name="Optional Translation - Korean" selected="true"/>
-<pack index="33" name="Optional Translation - Polish" selected="true"/>
-<pack index="34" name="Optional Translation - Russian" selected="true"/>
-<pack index="35" name="Optional Translation - Spanish" selected="true"/>
-</com.izforge.izpack.panels.PacksPanel>
-<com.izforge.izpack.panels.InstallPanel id="UNKNOWN (com.izforge.izpack.panels.InstallPanel)"/>
-<com.izforge.izpack.panels.ShortcutPanel id="UNKNOWN (com.izforge.izpack.panels.ShortcutPanel)"/>
-<com.izforge.izpack.panels.FinishPanel id="UNKNOWN (com.izforge.izpack.panels.FinishPanel)"/>
-</AutomatedInstallation>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-08-11 00:00:58
|
Revision: 5786
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5786&view=rev
Author: manningr
Date: 2010-08-11 00:00:52 +0000 (Wed, 11 Aug 2010)
Log Message:
-----------
test various auto install configurations that represent the different plain zip archives. Upload the result to SF along with the other installer.
Modified Paths:
--------------
trunk/sql12/installer/squirrelsql-other-installer/pom.xml
trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/batch.txt
Modified: trunk/sql12/installer/squirrelsql-other-installer/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2010-08-10 23:56:24 UTC (rev 5785)
+++ trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2010-08-11 00:00:52 UTC (rev 5786)
@@ -485,23 +485,88 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2</version>
- <configuration>
- <executable>java</executable>
- <arguments>
- <argument>-jar</argument>
- <argument>${project.build.directory}/squirrelsql-other-installer-${project.version}-standard.jar</argument>
- <argument>${project.build.directory}/test-classes/auto-install.xml</argument>
- </arguments>
- </configuration>
<executions>
<execution>
+ <id>test-base-install</id>
<goals>
<goal>exec</goal>
</goals>
<phase>integration-test</phase>
+ <configuration>
+ <executable>java</executable>
+ <arguments>
+ <argument>-jar</argument>
+ <argument>${project.build.directory}/squirrelsql-other-installer-${project.version}-standard.jar</argument>
+ <argument>${project.build.directory}/test-classes/base-auto-install.xml</argument>
+ </arguments>
+ </configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>test-standard-install</id>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <phase>integration-test</phase>
+ <configuration>
+ <executable>java</executable>
+ <arguments>
+ <argument>-jar</argument>
+ <argument>${project.build.directory}/squirrelsql-other-installer-${project.version}-standard.jar</argument>
+ <argument>${project.build.directory}/test-classes/standard-auto-install.xml</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>test-optional-install</id>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <phase>integration-test</phase>
+ <configuration>
+ <executable>java</executable>
+ <arguments>
+ <argument>-jar</argument>
+ <argument>${project.build.directory}/squirrelsql-other-installer-${project.version}-standard.jar</argument>
+ <argument>${project.build.directory}/test-classes/optional-auto-install.xml</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>build-plainzips</id>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <phase>integration-test</phase>
+ <configuration>
+ <executable>sh</executable>
+ <arguments>
+ <argument>${project.build.directory}/test-classes/build-plainzips.sh</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<profiles>
@@ -533,10 +598,9 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
</build>
</profile>
</profiles>
-
</project>
\ No newline at end of file
Modified: trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/batch.txt
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/batch.txt 2010-08-10 23:56:24 UTC (rev 5785)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/batch.txt 2010-08-11 00:00:52 UTC (rev 5786)
@@ -1,4 +1,9 @@
cd ${file.release.path}
+mkdir ${squirrelsql.version}-plainzip
+cd ${squirrelsql.version}-plainzip
+put target/squirrel-sql-${squirrelsql.version}-base.tar.gz
+put target/squirrel-sql-${squirrelsql.version}-standard.tar.gz
+put target/squirrel-sql-${squirrelsql.version}-optional.tar.gz
mkdir ${squirrelsql.version}
-cd ${squirrelsql.version}
+cd ../${squirrelsql.version}
put target/${project.build.finalName}-standard.jar ${upload-server-path}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-08-10 23:56:30
|
Revision: 5785
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5785&view=rev
Author: manningr
Date: 2010-08-10 23:56:24 +0000 (Tue, 10 Aug 2010)
Log Message:
-----------
new test resources which are also used to build the plain zip distribution files generated from the installer.
Added Paths:
-----------
trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/base-auto-install.xml
trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/build-plainzips.sh
trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/optional-auto-install.xml
trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/squirrel-sql.sh
trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/standard-auto-install.xml
Added: trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/base-auto-install.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/base-auto-install.xml (rev 0)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/base-auto-install.xml 2010-08-10 23:56:24 UTC (rev 5785)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<AutomatedInstallation langpack="eng">
+<com.izforge.izpack.panels.HelloPanel id="UNKNOWN (com.izforge.izpack.panels.HelloPanel)"/>
+<com.izforge.izpack.panels.HTMLInfoPanel id="UNKNOWN (com.izforge.izpack.panels.HTMLInfoPanel)"/>
+<com.izforge.izpack.panels.TargetPanel id="UNKNOWN (com.izforge.izpack.panels.TargetPanel)">
+<installpath>${project.build.directory}/squirrel-sql-${squirrelsql.version}-base</installpath>
+</com.izforge.izpack.panels.TargetPanel>
+<com.izforge.izpack.panels.PacksPanel id="UNKNOWN (com.izforge.izpack.panels.PacksPanel)">
+<pack index="0" name="Base" selected="true"/>
+<pack index="0" name="Standard" selected="false"/>
+</com.izforge.izpack.panels.PacksPanel>
+<com.izforge.izpack.panels.InstallPanel id="UNKNOWN (com.izforge.izpack.panels.InstallPanel)"/>
+<com.izforge.izpack.panels.ShortcutPanel id="UNKNOWN (com.izforge.izpack.panels.ShortcutPanel)"/>
+<com.izforge.izpack.panels.FinishPanel id="UNKNOWN (com.izforge.izpack.panels.FinishPanel)"/>
+</AutomatedInstallation>
Added: trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/build-plainzips.sh
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/build-plainzips.sh (rev 0)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/build-plainzips.sh 2010-08-10 23:56:24 UTC (rev 5785)
@@ -0,0 +1,18 @@
+#! /bin/bash
+
+
+cp ${project.build.directory}/test-classes/squirrel-sql.sh ${project.build.directory}/squirrel-sql-${squirrelsql.version}-base/squirrel-sql.sh
+cp ${project.build.directory}/test-classes/squirrel-sql.sh ${project.build.directory}/squirrel-sql-${squirrelsql.version}-standard/squirrel-sql.sh
+cp ${project.build.directory}/test-classes/squirrel-sql.sh ${project.build.directory}/squirrel-sql-${squirrelsql.version}-optional/squirrel-sql.sh
+
+
+cd ${project.build.directory}
+
+tar -cvf squirrel-sql-${squirrelsql.version}-base.tar squirrel-sql-${squirrelsql.version}-base
+gzip squirrel-sql-${squirrelsql.version}-base.tar
+
+tar -cvf squirrel-sql-${squirrelsql.version}-standard.tar squirrel-sql-${squirrelsql.version}-standard
+gzip squirrel-sql-${squirrelsql.version}-standard.tar
+
+tar -cvf squirrel-sql-${squirrelsql.version}-optional.tar squirrel-sql-${squirrelsql.version}-optional
+gzip squirrel-sql-${squirrelsql.version}-optional.tar
Property changes on: trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/build-plainzips.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/optional-auto-install.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/optional-auto-install.xml (rev 0)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/optional-auto-install.xml 2010-08-10 23:56:24 UTC (rev 5785)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<AutomatedInstallation langpack="eng">
+<com.izforge.izpack.panels.HelloPanel id="UNKNOWN (com.izforge.izpack.panels.HelloPanel)"/>
+<com.izforge.izpack.panels.HTMLInfoPanel id="UNKNOWN (com.izforge.izpack.panels.HTMLInfoPanel)"/>
+<com.izforge.izpack.panels.TargetPanel id="UNKNOWN (com.izforge.izpack.panels.TargetPanel)">
+<installpath>${project.build.directory}/squirrel-sql-${squirrelsql.version}-optional</installpath>
+</com.izforge.izpack.panels.TargetPanel>
+<com.izforge.izpack.panels.PacksPanel id="UNKNOWN (com.izforge.izpack.panels.PacksPanel)">
+<pack index="0" name="Base" selected="true"/>
+<pack index="1" name="Standard" selected="true"/>
+<pack index="2" name="Optional Plugin - Data import" selected="true"/>
+<pack index="3" name="Optional Plugin - DBCopy" selected="true"/>
+<pack index="4" name="Optional Plugin - DBDiff" selected="true"/>
+<pack index="5" name="Optional Plugin - DB2" selected="true"/>
+<pack index="6" name="Optional Plugin - Derby" selected="true"/>
+<pack index="7" name="Optional Plugin - Firebird " selected="true"/>
+<pack index="8" name="Optional Plugin - Firebird Manager" selected="true"/>
+<pack index="9" name="Optional Plugin - H2 " selected="true"/>
+<pack index="10" name="Optional Plugin - Hibernate " selected="true"/>
+<pack index="11" name="Optional Plugin - Informix " selected="true"/>
+<pack index="12" name="Optional Plugin - Microsoft SQL Server " selected="true"/>
+<pack index="13" name="Optional Plugin - MySQL " selected="true"/>
+<pack index="14" name="Optional Plugin - Netezza" selected="true"/>
+<pack index="15" name="Optional Plugin - Oracle" selected="true"/>
+<pack index="16" name="Optional Plugin - PostgreSQL " selected="true"/>
+<pack index="17" name="Optional Plugin - Refactoring" selected="true"/>
+<pack index="18" name="Optional Plugin - Session Scripts" selected="true"/>
+<pack index="19" name="Optional Plugin - Smart Tools " selected="true"/>
+<pack index="20" name="Optional Plugin - SQL Parametrisation " selected="true"/>
+<pack index="21" name="Optional Plugin - SQL Replace " selected="true"/>
+<pack index="22" name="Optional Plugin - SQL Validator " selected="true"/>
+<pack index="23" name="Optional Plugin - Sybase " selected="true"/>
+<pack index="24" name="Optional Plugin - Internationalization " selected="true"/>
+<pack index="25" name="Optional Translation - Brazilian Portuguese" selected="true"/>
+<pack index="26" name="Optional Translation - Bulgarian" selected="true"/>
+<pack index="27" name="Optional Translation - Czech" selected="true"/>
+<pack index="28" name="Optional Translation - Simplified Chinese" selected="true"/>
+<pack index="29" name="Optional Translation - French" selected="true"/>
+<pack index="30" name="Optional Translation - German" selected="true"/>
+<pack index="31" name="Optional Translation - Italian" selected="true"/>
+<pack index="32" name="Optional Translation - Korean" selected="true"/>
+<pack index="33" name="Optional Translation - Polish" selected="true"/>
+<pack index="34" name="Optional Translation - Russian" selected="true"/>
+<pack index="35" name="Optional Translation - Spanish" selected="true"/>
+</com.izforge.izpack.panels.PacksPanel>
+<com.izforge.izpack.panels.InstallPanel id="UNKNOWN (com.izforge.izpack.panels.InstallPanel)"/>
+<com.izforge.izpack.panels.ShortcutPanel id="UNKNOWN (com.izforge.izpack.panels.ShortcutPanel)"/>
+<com.izforge.izpack.panels.FinishPanel id="UNKNOWN (com.izforge.izpack.panels.FinishPanel)"/>
+</AutomatedInstallation>
Added: trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/squirrel-sql.sh
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/squirrel-sql.sh (rev 0)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/squirrel-sql.sh 2010-08-10 23:56:24 UTC (rev 5785)
@@ -0,0 +1,108 @@
+#! /bin/sh
+
+# IZPACK_JAVA_HOME is filtered in by the IzPack installer when this script is installed
+IZPACK_JAVA_HOME=%JAVA_HOME
+
+# We detect the java executable to use according to the following algorithm:
+#
+# 1. If it is located in JAVA_HOME, then we use that; or
+# 2. If the one used by the IzPack installer is available then use that, otherwise
+# 3. Use the java that is in the command path.
+#
+if [ -d "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then
+ JAVACMD="$JAVA_HOME/bin/java"
+elif [ -d "$IZPACK_JAVA_HOME" -a -x "$IZPACK_JAVA_HOME/bin/java" ]; then
+ JAVACMD="$IZPACK_JAVA_HOME/bin/java"
+else
+ JAVACMD=java
+fi
+
+# Are we running within Cygwin on some version of Windows or on Mac OS X?
+cygwin=false;
+macosx=false;
+case "`uname -s`" in
+ CYGWIN*)
+ cygwin=true
+ ;;
+ Darwin*)
+ macosx=true
+ ;;
+esac
+
+# SQuirreL home. This is the plain zip version of squirrel-sql.sh, so the installer isn't run. In this case
+# the script cannot be modified by the installer to hard-code the install path. We prefer to specify squirrel
+# home as an absolute path, so that the command will work when exec'd from any location. So we attempt to
+# detect the absolute path using dirname "$0", which should work in most cases.
+if $macosx ; then
+ SQUIRREL_SQL_HOME=`dirname "$0"`/Contents/Resources/Java
+else
+ SQUIRREL_SQL_HOME=`dirname "$0"`
+fi
+
+# SQuirreL home in Unix format.
+if $cygwin ; then
+ UNIX_STYLE_HOME=`cygpath "$SQUIRREL_SQL_HOME"`
+else
+ UNIX_STYLE_HOME="$SQUIRREL_SQL_HOME"
+fi
+
+cd "$UNIX_STYLE_HOME"
+
+# Check to see if the JVM meets the minimum required to run SQuirreL and inform the user if not and skip
+# launch. versioncheck.jar is a special jar file which has been compiled with javac version 1.2.2, which
+# should be able to be run by that version or higher. The arguments to JavaVersionChecker below specify the
+# minimum acceptable version (first arg) and any other acceptable subsequent versions. <MAJOR>.<MINOR> should
+# be all that is necessary for the version form.
+$JAVACMD -cp "$UNIX_STYLE_HOME/lib/versioncheck.jar" JavaVersionChecker 1.6 1.7
+if [ "$?" = "1" ]; then
+ exit
+fi
+
+# First entry in classpath is the Squirrel application.
+TMP_CP="$UNIX_STYLE_HOME/squirrel-sql.jar"
+
+# Then add all library jars to the classpath.
+for a in "$UNIX_STYLE_HOME"/lib/*; do
+ TMP_CP="$TMP_CP":"$a"
+done
+
+# Set the update app's classpath to use jars in download area first, then the installed jars
+UPDATE_CP=$TMP_CP
+for a in "$UNIX_STYLE_HOME"/update/downloads/core/*; do
+ UPDATE_CP="$a":"$UPDATE_CP"
+done
+
+
+# Now add the system classpath to the classpath. If running
+# Cygwin we also need to change the classpath to Windows format.
+if $cygwin ; then
+ TMP_CP=`cygpath -w -p $TMP_CP`
+ UPDATE_CP=`cygpath -w -p $UPDATE_CP`
+ TMP_CP=$TMP_CP';'$CLASSPATH
+ UPDATE_CP=$UPDATE_CP';'$CLASSPATH
+else
+ TMP_CP=$TMP_CP:$CLASSPATH
+ UPDATE_CP=$UPDATE_CP:$CLASSPATH
+fi
+
+if $macosx ; then
+ # Define mac-specific system properties if running on Mac OS X
+ MACOSX_UPDATER_PROPS="-Dapple.laf.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name=SQuirreLSQLUpdater"
+ MACOSX_SQUIRREL_PROPS="-Dapple.laf.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name=SQuirreLSQL"
+ NATIVE_LAF_PROP="--native-laf"
+fi
+
+# Check for updates and prompt to apply if any are available
+if [ -f "$UNIX_STYLE_HOME/update/downloads/core/squirrel-sql.jar" -a -f "$UNIX_STYLE_HOME/update/changeList.xml" ]; then
+ $JAVACMD -cp "$UPDATE_CP" $MACOSX_UPDATER_PROPS -Dlog4j.defaultInitOverride=true -Dprompt=true net.sourceforge.squirrel_sql.client.update.gui.installer.PreLaunchUpdateApplication -l "$UNIX_STYLE_HOME/update-log4j.properties"
+fi
+
+if $macosx ; then
+ # macosx provides unknown args to the script, causing SQuirreL to bail..
+ SCRIPT_ARGS=""
+else
+ SCRIPT_ARGS="$1 $2 $3 $4 $5 $6 $7 $8 $9"
+fi
+
+# Launch SQuirreL application
+$JAVACMD -Xmx256m -cp "$TMP_CP" $MACOSX_SQUIRREL_PROPS net.sourceforge.squirrel_sql.client.Main --log-config-file "$UNIX_STYLE_HOME"/log4j.properties --squirrel-home "$UNIX_STYLE_HOME" $NATIVE_LAF_PROP $SCRIPT_ARGS
Property changes on: trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/squirrel-sql.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/standard-auto-install.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/standard-auto-install.xml (rev 0)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/standard-auto-install.xml 2010-08-10 23:56:24 UTC (rev 5785)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<AutomatedInstallation langpack="eng">
+<com.izforge.izpack.panels.HelloPanel id="UNKNOWN (com.izforge.izpack.panels.HelloPanel)"/>
+<com.izforge.izpack.panels.HTMLInfoPanel id="UNKNOWN (com.izforge.izpack.panels.HTMLInfoPanel)"/>
+<com.izforge.izpack.panels.TargetPanel id="UNKNOWN (com.izforge.izpack.panels.TargetPanel)">
+<installpath>${project.build.directory}/squirrel-sql-${squirrelsql.version}-standard</installpath>
+</com.izforge.izpack.panels.TargetPanel>
+<com.izforge.izpack.panels.PacksPanel id="UNKNOWN (com.izforge.izpack.panels.PacksPanel)">
+<pack index="0" name="Base" selected="true"/>
+<pack index="1" name="Standard" selected="true"/>
+</com.izforge.izpack.panels.PacksPanel>
+<com.izforge.izpack.panels.InstallPanel id="UNKNOWN (com.izforge.izpack.panels.InstallPanel)"/>
+<com.izforge.izpack.panels.ShortcutPanel id="UNKNOWN (com.izforge.izpack.panels.ShortcutPanel)"/>
+<com.izforge.izpack.panels.FinishPanel id="UNKNOWN (com.izforge.izpack.panels.FinishPanel)"/>
+</AutomatedInstallation>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-08-10 21:26:17
|
Revision: 5784
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5784&view=rev
Author: manningr
Date: 2010-08-10 21:26:11 +0000 (Tue, 10 Aug 2010)
Log Message:
-----------
Upload source archive to SF if uploadInstallers property is set.
Modified Paths:
--------------
trunk/sql12/installer/squirrelsql-source/pom.xml
Added Paths:
-----------
trunk/sql12/installer/squirrelsql-source/src/main/resources/batch.txt
Modified: trunk/sql12/installer/squirrelsql-source/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-source/pom.xml 2010-08-10 12:00:16 UTC (rev 5783)
+++ trunk/sql12/installer/squirrelsql-source/pom.xml 2010-08-10 21:26:11 UTC (rev 5784)
@@ -1,15 +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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>installer</artifactId>
- <groupId>net.sf.squirrel-sql</groupId>
- <version>3.2.0-SNAPSHOT</version>
- </parent>
- <groupId>net.sf.squirrel-sql</groupId>
- <artifactId>squirrelsql-source</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- <name>SQuirreL SQL Client Source Archive (Aggregate)</name>
- <description>
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>installer</artifactId>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <version>3.2.0-SNAPSHOT</version>
+ </parent>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrelsql-source</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ <name>SQuirreL SQL Client Source Archive (Aggregate)</name>
+ <description>
This is a project to create a single source archive of the entire source tree as a
convenience for those who cannot access Maven Central
</description>
@@ -51,47 +54,79 @@
<system>Hudson</system>
<url>https://www.squirrel-sql.org/hudson/</url>
</ciManagement>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-plugin</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <configuration>
- <baseDir>sql12</baseDir>
- <exportDirectory>target/sources</exportDirectory>
- </configuration>
- <goals>
- <goal>export</goal>
- </goals>
- <phase>generate-sources</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${assembly-plugin-version}</version>
- <executions>
- <execution>
- <id>create-source-archive</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/resources/assemblies/source-assembly.xml</descriptor>
- </descriptors>
- <finalName>squirrel-sql-source</finalName>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <configuration>
+ <baseDir>sql12</baseDir>
+ <exportDirectory>target/sources</exportDirectory>
+ </configuration>
+ <goals>
+ <goal>export</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${assembly-plugin-version}</version>
+ <executions>
+ <execution>
+ <id>create-source-archive</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/resources/assemblies/source-assembly.xml</descriptor>
+ </descriptors>
+ <finalName>squirrel-sql-source</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <activation>
+ <property>
+ <name>uploadInstallers</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <configuration>
+ <executable>sftp</executable>
+ <arguments>
+ <argument>-b</argument>
+ <argument>target/classes/batch.txt</argument>
+ <argument>${file.release.server}</argument>
+ </arguments>
+ </configuration>
+ <phase>deploy</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
Added: trunk/sql12/installer/squirrelsql-source/src/main/resources/batch.txt
===================================================================
--- trunk/sql12/installer/squirrelsql-source/src/main/resources/batch.txt (rev 0)
+++ trunk/sql12/installer/squirrelsql-source/src/main/resources/batch.txt 2010-08-10 21:26:11 UTC (rev 5784)
@@ -0,0 +1,4 @@
+cd ${file.release.path}
+mkdir ${squirrelsql.version}
+cd ${squirrelsql.version}
+put target/squirrel-sql-source.zip ${upload-server-path}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
