Menu
▾
▴
[V-q-misc] [http://svn.berlios.de/svnroot/repos/v-q] r348 - in trunk: base/jdbc base/jdbc/lib base/jdbc/src/com/foo_baz/v_q base/jdbc/src/com/foo_baz/v_q/iloggerPackage contrib/service/jdbclogd tests/misc
Author: paweln
Date: 2006-03-14 23:36:21 +0100 (Tue, 14 Mar 2006)
New Revision: 348
Added:
trunk/base/jdbc/lib/
trunk/base/jdbc/lib/idldepend-0-8-1.jar
trunk/base/jdbc/src/com/foo_baz/v_q/iloggerPackage/string_list2Helper.java
trunk/base/jdbc/src/com/foo_baz/v_q/iloggerPackage/string_list2Holder.java
trunk/base/jdbc/src/com/foo_baz/v_q/iloggerPackage/string_listHelper.java
trunk/base/jdbc/src/com/foo_baz/v_q/iloggerPackage/string_listHolder.java
trunk/tests/misc/connect.pl
trunk/tests/misc/create.pl
Removed:
trunk/base/jdbc/idldepend-0-8-1.jar
Modified:
trunk/base/jdbc/build.xml
trunk/base/jdbc/src/com/foo_baz/v_q/JDBCLog.java
trunk/contrib/service/jdbclogd/run
Log:
CODE: added few scripts that may be useful during tests
CODE: changed JDBCLog - problem with comparing Boolean with boolean
CODE: added some classes generated from IDL which I forgot about
Modified: trunk/base/jdbc/build.xml
===================================================================
--- trunk/base/jdbc/build.xml 2006-03-07 21:09:19 UTC (rev 347)
+++ trunk/base/jdbc/build.xml 2006-03-14 22:36:21 UTC (rev 348)
@@ -1,5 +1,9 @@
<project name="jdbcd" basedir="." default="jar">
- <taskdef name="idlcheck" classname="idldepend.IDLCheckerTask" classpath="idldepend-0-8-1.jar"/>
+ <taskdef name="idlcheck" classname="idldepend.IDLCheckerTask">
+ <classpath>
+ <pathelement location="lib/idldepend-0-8-1.jar"/>
+ </classpath>
+ </taskdef>
<!-- Project settings -->
<property name="project.distname" value="jdbcd"/>
Deleted: trunk/base/jdbc/idldepend-0-8-1.jar
===================================================================
(Binary files differ)
Copied: trunk/base/jdbc/lib/idldepend-0-8-1.jar (from rev 345, trunk/base/jdbc/idldepend-0-8-1.jar)
Modified: trunk/base/jdbc/src/com/foo_baz/v_q/JDBCLog.java
===================================================================
--- trunk/base/jdbc/src/com/foo_baz/v_q/JDBCLog.java 2006-03-07 21:09:19 UTC (rev 347)
+++ trunk/base/jdbc/src/com/foo_baz/v_q/JDBCLog.java 2006-03-14 22:36:21 UTC (rev 348)
@@ -341,7 +341,7 @@
les.value = new String[0][0];
ArrayList ales = new ArrayList();
- if( this.read_by_sql != true )
+ if( this.read_by_sql.booleanValue() != true )
return lr(err_code.err_perm, "read_by_sql");
PreparedStatement st = null;
@@ -463,7 +463,7 @@
*
*/
public error rm_by_sql( String where ) throws null_error, db_error, except { try {
- if( this.rm_by_sql != true )
+ if( this.rm_by_sql.booleanValue() != true )
return lr(err_code.err_perm, "rm_by_sql");
CallableStatement call = con.prepareCall( "{ ? = call log_rm_by_sql(?) }" );
Added: trunk/base/jdbc/src/com/foo_baz/v_q/iloggerPackage/string_list2Helper.java
===================================================================
--- trunk/base/jdbc/src/com/foo_baz/v_q/iloggerPackage/string_list2Helper.java 2006-03-07 21:09:19 UTC (rev 347)
+++ trunk/base/jdbc/src/com/foo_baz/v_q/iloggerPackage/string_list2Helper.java 2006-03-14 22:36:21 UTC (rev 348)
@@ -0,0 +1,64 @@
+package com.foo_baz.v_q.iloggerPackage;
+
+
+/**
+* com/foo_baz/v_q/iloggerPackage/string_list2Helper.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from /home/new/svn/berlios.de/v-q/trunk/base/logger.idl
+* poniedziaek, 6 marzec 2006 22:05:09 CET
+*/
+
+abstract public class string_list2Helper
+{
+ private static String _id = "IDL:vq/ilogger/string_list2:1.0";
+
+ public static void insert (org.omg.CORBA.Any a, String[][] that)
+ {
+ org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
+ a.type (type ());
+ write (out, that);
+ a.read_value (out.create_input_stream (), type ());
+ }
+
+ public static String[][] extract (org.omg.CORBA.Any a)
+ {
+ return read (a.create_input_stream ());
+ }
+
+ private static org.omg.CORBA.TypeCode __typeCode = null;
+ synchronized public static org.omg.CORBA.TypeCode type ()
+ {
+ if (__typeCode == null)
+ {
+ __typeCode = org.omg.CORBA.ORB.init ().create_string_tc (0);
+ __typeCode = org.omg.CORBA.ORB.init ().create_sequence_tc (0, __typeCode);
+ __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (com.foo_baz.v_q.iloggerPackage.string_listHelper.id (), "string_list", __typeCode);
+ __typeCode = org.omg.CORBA.ORB.init ().create_sequence_tc (0, __typeCode);
+ __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (com.foo_baz.v_q.iloggerPackage.string_list2Helper.id (), "string_list2", __typeCode);
+ }
+ return __typeCode;
+ }
+
+ public static String id ()
+ {
+ return _id;
+ }
+
+ public static String[][] read (org.omg.CORBA.portable.InputStream istream)
+ {
+ String value[][] = null;
+ int _len0 = istream.read_long ();
+ value = new String[_len0][];
+ for (int _o1 = 0;_o1 < value.length; ++_o1)
+ value[_o1] = com.foo_baz.v_q.iloggerPackage.string_listHelper.read (istream);
+ return value;
+ }
+
+ public static void write (org.omg.CORBA.portable.OutputStream ostream, String[][] value)
+ {
+ ostream.write_long (value.length);
+ for (int _i0 = 0;_i0 < value.length; ++_i0)
+ com.foo_baz.v_q.iloggerPackage.string_listHelper.write (ostream, value[_i0]);
+ }
+
+}
Added: trunk/base/jdbc/src/com/foo_baz/v_q/iloggerPackage/string_list2Holder.java
===================================================================
--- trunk/base/jdbc/src/com/foo_baz/v_q/iloggerPackage/string_list2Holder.java 2006-03-07 21:09:19 UTC (rev 347)
+++ trunk/base/jdbc/src/com/foo_baz/v_q/iloggerPackage/string_list2Holder.java 2006-03-14 22:36:21 UTC (rev 348)
@@ -0,0 +1,39 @@
+package com.foo_baz.v_q.iloggerPackage;
+
+
+/**
+* com/foo_baz/v_q/iloggerPackage/string_list2Holder.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from /home/new/svn/berlios.de/v-q/trunk/base/logger.idl
+* poniedziaek, 6 marzec 2006 22:05:09 CET
+*/
+
+public final class string_list2Holder implements org.omg.CORBA.portable.Streamable
+{
+ public String value[][] = null;
+
+ public string_list2Holder ()
+ {
+ }
+
+ public string_list2Holder (String[][] initialValue)
+ {
+ value = initialValue;
+ }
+
+ public void _read (org.omg.CORBA.portable.InputStream i)
+ {
+ value = com.foo_baz.v_q.iloggerPackage.string_list2Helper.read (i);
+ }
+
+ public void _write (org.omg.CORBA.portable.OutputStream o)
+ {
+ com.foo_baz.v_q.iloggerPackage.string_list2Helper.write (o, value);
+ }
+
+ public org.omg.CORBA.TypeCode _type ()
+ {
+ return com.foo_baz.v_q.iloggerPackage.string_list2Helper.type ();
+ }
+
+}
Added: trunk/base/jdbc/src/com/foo_baz/v_q/iloggerPackage/string_listHelper.java
===================================================================
--- trunk/base/jdbc/src/com/foo_baz/v_q/iloggerPackage/string_listHelper.java 2006-03-07 21:09:19 UTC (rev 347)
+++ trunk/base/jdbc/src/com/foo_baz/v_q/iloggerPackage/string_listHelper.java 2006-03-14 22:36:21 UTC (rev 348)
@@ -0,0 +1,62 @@
+package com.foo_baz.v_q.iloggerPackage;
+
+
+/**
+* com/foo_baz/v_q/iloggerPackage/string_listHelper.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from /home/new/svn/berlios.de/v-q/trunk/base/logger.idl
+* poniedziaek, 6 marzec 2006 22:05:09 CET
+*/
+
+abstract public class string_listHelper
+{
+ private static String _id = "IDL:vq/ilogger/string_list:1.0";
+
+ public static void insert (org.omg.CORBA.Any a, String[] that)
+ {
+ org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
+ a.type (type ());
+ write (out, that);
+ a.read_value (out.create_input_stream (), type ());
+ }
+
+ public static String[] extract (org.omg.CORBA.Any a)
+ {
+ return read (a.create_input_stream ());
+ }
+
+ private static org.omg.CORBA.TypeCode __typeCode = null;
+ synchronized public static org.omg.CORBA.TypeCode type ()
+ {
+ if (__typeCode == null)
+ {
+ __typeCode = org.omg.CORBA.ORB.init ().create_string_tc (0);
+ __typeCode = org.omg.CORBA.ORB.init ().create_sequence_tc (0, __typeCode);
+ __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (com.foo_baz.v_q.iloggerPackage.string_listHelper.id (), "string_list", __typeCode);
+ }
+ return __typeCode;
+ }
+
+ public static String id ()
+ {
+ return _id;
+ }
+
+ public static String[] read (org.omg.CORBA.portable.InputStream istream)
+ {
+ String value[] = null;
+ int _len0 = istream.read_long ();
+ value = new String[_len0];
+ for (int _o1 = 0;_o1 < value.length; ++_o1)
+ value[_o1] = istream.read_string ();
+ return value;
+ }
+
+ public static void write (org.omg.CORBA.portable.OutputStream ostream, String[] value)
+ {
+ ostream.write_long (value.length);
+ for (int _i0 = 0;_i0 < value.length; ++_i0)
+ ostream.write_string (value[_i0]);
+ }
+
+}
Added: trunk/base/jdbc/src/com/foo_baz/v_q/iloggerPackage/string_listHolder.java
===================================================================
--- trunk/base/jdbc/src/com/foo_baz/v_q/iloggerPackage/string_listHolder.java 2006-03-07 21:09:19 UTC (rev 347)
+++ trunk/base/jdbc/src/com/foo_baz/v_q/iloggerPackage/string_listHolder.java 2006-03-14 22:36:21 UTC (rev 348)
@@ -0,0 +1,39 @@
+package com.foo_baz.v_q.iloggerPackage;
+
+
+/**
+* com/foo_baz/v_q/iloggerPackage/string_listHolder.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from /home/new/svn/berlios.de/v-q/trunk/base/logger.idl
+* poniedziaek, 6 marzec 2006 22:05:09 CET
+*/
+
+public final class string_listHolder implements org.omg.CORBA.portable.Streamable
+{
+ public String value[] = null;
+
+ public string_listHolder ()
+ {
+ }
+
+ public string_listHolder (String[] initialValue)
+ {
+ value = initialValue;
+ }
+
+ public void _read (org.omg.CORBA.portable.InputStream i)
+ {
+ value = com.foo_baz.v_q.iloggerPackage.string_listHelper.read (i);
+ }
+
+ public void _write (org.omg.CORBA.portable.OutputStream o)
+ {
+ com.foo_baz.v_q.iloggerPackage.string_listHelper.write (o, value);
+ }
+
+ public org.omg.CORBA.TypeCode _type ()
+ {
+ return com.foo_baz.v_q.iloggerPackage.string_listHelper.type ();
+ }
+
+}
Modified: trunk/contrib/service/jdbclogd/run
===================================================================
--- trunk/contrib/service/jdbclogd/run 2006-03-07 21:09:19 UTC (rev 347)
+++ trunk/contrib/service/jdbclogd/run 2006-03-14 22:36:21 UTC (rev 348)
@@ -34,13 +34,16 @@
# v-q jars
export CLASSPATH="$CLASSPATH":"$VQ_HOME/lib/vq/corbautil.jar":"$VQ_HOME/lib/vq/jdbcd.jar"
+# Debugging?
+#JAVA_DEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=n"
+
# PostgreSQL
-java -Djdbc.drivers="$drivers" \
+java $JAVA_DEBUG -Djdbc.drivers="$drivers" \
-Dcom.foo_baz.v_q."$prog".jdbc=jdbc:postgresql://localhost/mail \
"$prog" -ORBInitRef NameService=corbaloc::127.0.0.1:2809/NameService
# Oracle
-#java -Djdbc.drivers="$drivers" \
+#java $JAVA_DEBUG -Djdbc.drivers="$drivers" \
#-Dcom.foo_baz.v_q."$prog".jdbc=jdbc:oracle:thin:@localhost:1521:orcl \
#"$prog" -ORBInitRef NameService=corbaloc::127.0.0.1:2809/NameService
Added: trunk/tests/misc/connect.pl
===================================================================
--- trunk/tests/misc/connect.pl 2006-03-07 21:09:19 UTC (rev 347)
+++ trunk/tests/misc/connect.pl 2006-03-14 22:36:21 UTC (rev 348)
@@ -0,0 +1,84 @@
+#!/usr/bin/perl
+
+package main;
+$Getopt::Std::STANDARD_HELP_VERSION = 1;
+sub VERSION_MESSAGE {
+ my $out = shift;
+ print $out "$0\n";
+}
+
+sub HELP_MESSAGE {
+ my $out = shift;
+ print $out "usage: $0 [-c #connections|-t #seconds]\n";
+ print $out "-t #\tnumber of seconds script will run\n";
+ print $out "-c #\tnumber of connections (default: 1000)\n";
+ print $out "-l hostname\tmachine to connect using SMTP and POP3 (default: localhost)\n";
+ print $out "<stdin> should be a list of e-mail addresses that will be used\n";
+ print $out "\t(password should be the same as e-mail address)\n";
+}
+
+package connect;
+
+use Getopt::Std;
+use Net::SMTP;
+use Net::POP3;
+
+# Configuration
+
+my %opts = ();
+getopts('t:c:l:', \%opts);
+
+my $secs = $opts{'t'} ? $opts{'t'} : 0;
+my $cons_cnt = $opts{'c'} ? $opts{'c'} : 1000;
+my $host = $opts{'l'} ? $opts{'l'} : "localhost";
+
+my @emails = ();
+while(<>) {
+ chomp if( /\n/ );
+ push(@emails, $_);
+}
+
+if( ! @emails."" ) {
+ print STDERR "No e-mails specified, quiting...\n";
+ exit 1;
+}
+
+my $loop = 0;
+if( $secs > 0 ) {
+ $loop = 1;
+ $SIG{ALRM} = sub {exit;};
+ alarm($secs);
+}
+
+for( my $i=0; $i < $cons_cnt || $loop; ++$i ) {
+ my $idx = int(rand(@emails.""));
+ my $type = int(rand(2));
+ print $emails[$idx].": ";
+ if( $type ) {
+ print "SMTP: ";
+ my $smtp = Net::SMTP->new($host);
+ if( $smtp->auth( $emails[$idx], $emails[$idx] )
+ && $smtp->mail("#\@<>")
+ && $smtp->to($emails[$idx])
+ && $smtp->data()
+ && $smtp->datasend("Subject: $0\n\n$emails[$idx]\n")
+ && $smtp->dataend()
+ && $smtp->quit() ) {
+ print "OK";
+ } else {
+ print "ERROR";
+ }
+ } else {
+ print "POP3: ";
+ my $pop = Net::POP3->new($host);
+ if( $pop->login($emails[$idx], $emails[$idx])
+ && $pop->quit() ) {
+ print "OK";
+ } else {
+ print "ERROR";
+ }
+ }
+ print "\n";
+}
+
+1;
Property changes on: trunk/tests/misc/connect.pl
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/tests/misc/create.pl
===================================================================
--- trunk/tests/misc/create.pl 2006-03-07 21:09:19 UTC (rev 347)
+++ trunk/tests/misc/create.pl 2006-03-14 22:36:21 UTC (rev 348)
@@ -0,0 +1,50 @@
+#!/usr/bin/perl
+
+package main;
+$Getopt::Std::STANDARD_HELP_VERSION = 1;
+sub VERSION_MESSAGE {
+ my $out = shift;
+ print $out "$0\n";
+}
+
+sub HELP_MESSAGE {
+ my $out = shift;
+ print $out "usage: $0 [-d #domains] [-u #users]\n";
+ print $out "-d #\tnumber of domains to create\n";
+ print $out "-u #\tnumber of users to create\n";
+}
+
+package random;
+
+use Getopt::Std;
+
+# Configuration
+
+my %opts = ();
+getopts('d:u:', \%opts);
+
+my $users_cnt = $opts{'u'} ? $opts{'u'} : 100;
+my $doms_cnt = $opts{'d'} ? $opts{'d'} : 10;
+
+my $suffix = ".random.pl";
+
+@doms = ();
+for( my $i=0; $i<$doms_cnt; ++$i ) {
+ my $dom = "$i$suffix";
+ $str=`dom_add "$dom"`;
+ if( $? >> 8 == 0 || $str =~ /#18:/ ) {
+ for( my $j=0; $j<$users_cnt; ++$j ) {
+ my $user = "$j\@$dom";
+ $str=`user_add "$user" "$user"`;
+ if( $? >> 8 == 0 || $str =~ /#18:/ ) {
+ print "$user\n";
+ } else {
+ print STDERR $str;
+ }
+ }
+ } else {
+ print STDERR $str;
+ }
+}
+
+1;
Property changes on: trunk/tests/misc/create.pl
___________________________________________________________________
Name: svn:executable
+ *
|