Return-Path: 
 <commits-return-13716-apmail-directory-commits-archive=directory.apache.org@directory.apache.org>
Delivered-To: apmail-directory-commits-archive@www.apache.org
Received: (qmail 49158 invoked from network); 19 May 2007 11:35:46 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 19 May 2007 11:35:46 -0000
Received: (qmail 61510 invoked by uid 500); 19 May 2007 11:35:52 -0000
Delivered-To: apmail-directory-commits-archive@directory.apache.org
Received: (qmail 61473 invoked by uid 500); 19 May 2007 11:35:51 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 61462 invoked by uid 99); 19 May 2007 11:35:51 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 May 2007 04:35:51 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 May 2007 04:35:45 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 0D4821A981D; Sat, 19 May 2007 04:35:25 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r539734 - in /directory/shared/trunk/ldap/src/main:
 antlr/TriggerSpecification.g
 java/org/apache/directory/shared/ldap/trigger/TriggerSpecification.java
Date: Sat, 19 May 2007 11:35:24 -0000
To: commits@directory.apache.org
From: ersiner@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070519113525.0D4821A981D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ersiner
Date: Sat May 19 04:35:24 2007
New Revision: 539734

URL: http://svn.apache.org/viewvc?view=rev&rev=539734
Log:
Generalized Trigger code.

Modified:
    directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/TriggerSpecification.java

Modified: directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g?view=diff&rev=539734&r1=539733&r2=539734
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g Sat May 19 04:35:24 2007
@@ -29,6 +29,8 @@
 
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.NormalizerMappingResolver;
+import org.apache.directory.shared.ldap.trigger.StoredProcedureOption;
+import org.apache.directory.shared.ldap.trigger.StoredProcedureParameter;
 import org.apache.directory.shared.ldap.trigger.TriggerSpecification.SPSpec;
 
 import org.slf4j.Logger;
@@ -79,9 +81,9 @@
     
     private String triggerStoredProcedureName;
     
-	private List triggerStoredProcedureParameters;
+	private List<StoredProcedureParameter> triggerStoredProcedureParameters;
 	
-	private List triggerStoredProcedureOptions;
+	private List<StoredProcedureOption> triggerStoredProcedureOptions;
     
     private List<SPSpec> spSpecs;   
     
@@ -238,8 +240,8 @@
     ID_CALL
     {
     	triggerStoredProcedureName = null;
-    	triggerStoredProcedureParameters = new ArrayList();
-		triggerStoredProcedureOptions = new ArrayList();
+    	triggerStoredProcedureParameters = new ArrayList<StoredProcedureParameter>();
+		triggerStoredProcedureOptions = new ArrayList<StoredProcedureOption>();
     }
     ( SP )+ triggerStoredProcedureName=fullyQualifiedStoredProcedureName ( SP )*
         ( genericStoredProcedureOptionList ( SP )* )?

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/TriggerSpecification.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/TriggerSpecification.java?view=diff&rev=539734&r1=539733&r2=539734
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/TriggerSpecification.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/TriggerSpecification.java Sat May 19 04:35:24 2007
@@ -20,7 +20,6 @@
 
 package org.apache.directory.shared.ldap.trigger;
 
-import java.util.Iterator;
 import java.util.List;
 
 import org.apache.commons.lang.NullArgumentException;
@@ -41,7 +40,6 @@
     private List<SPSpec> spSpecs; 
     
     
-    
     public TriggerSpecification( LdapOperation ldapOperation, ActionTime actionTime, List<SPSpec> spSpecs )
     {
         super();
@@ -78,11 +76,11 @@
     {
     	private String name;
         
-        private List<String> options;
+        private List<StoredProcedureOption> options;
         
-        private List<String> parameters;
+        private List<StoredProcedureParameter> parameters;
 
-        public SPSpec(String name, List<String> options, List<String> parameters) {
+        public SPSpec(String name, List<StoredProcedureOption> options, List<StoredProcedureParameter> parameters) {
 			super();
 			this.name = name;
 			this.options = options;
@@ -93,11 +91,11 @@
 			return name;
 		}
 
-		public List<String> getOptions() {
+		public List<StoredProcedureOption> getOptions() {
 			return options;
 		}
 
-		public List<String> getParameters() {
+		public List<StoredProcedureParameter> getParameters() {
 			return parameters;
 		}
 
@@ -138,15 +136,6 @@
 			return true;
 		}
 
-		
-
     }
-
-
-
-
-
-	
-    
     
 }