[overlord-commits] Overlord SVN: r240 - in sam/trunk: modules/core and 3 other directories.

overlord-commits at lists.jboss.org overlord-commits at lists.jboss.org
Wed Aug 13 07:56:07 EDT 2008


Author: heiko.braun at jboss.com
Date: 2008-08-13 07:56:07 -0400 (Wed, 13 Aug 2008)
New Revision: 240

Added:
   sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ConfigurationDef.java
   sam/trunk/modules/core/src/main/java/org/jboss/sam/config/DatabaseRefDef.java
   sam/trunk/modules/core/src/main/java/org/jboss/sam/config/DatasourceDef.java
Removed:
   sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ProcessingNodeDef.java
Modified:
   sam/trunk/modules/core/pom.xml
   sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ConfigFactory.java
   sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configurator.java
   sam/trunk/modules/core/src/main/java/org/jboss/sam/config/PropertyDef.java
   sam/trunk/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java
   sam/trunk/modules/core/src/test/resources/database/test.drl
   sam/trunk/pom.xml
   sam/trunk/sam-trunk.iml
Log:
Added datasource config element

Modified: sam/trunk/modules/core/pom.xml
===================================================================
--- sam/trunk/modules/core/pom.xml	2008-08-13 09:39:31 UTC (rev 239)
+++ sam/trunk/modules/core/pom.xml	2008-08-13 11:56:07 UTC (rev 240)
@@ -33,6 +33,10 @@
          <artifactId>drools-compiler</artifactId>
       </dependency>
 
+      <dependency>
+         <groupId>commons-dbcp</groupId>
+         <artifactId>commons-dbcp</artifactId>         
+      </dependency>
 
       <dependency>
          <groupId>junit</groupId>

Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ConfigFactory.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ConfigFactory.java	2008-08-13 09:39:31 UTC (rev 239)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ConfigFactory.java	2008-08-13 11:56:07 UTC (rev 240)
@@ -45,7 +45,7 @@
       return new ConfigFactory();
    }
 
-   public ProcessingNodeDef unmarshall(URL configFile)
+   public ConfigurationDef unmarshall(URL configFile)
    {
       try
       {
@@ -57,15 +57,15 @@
       }
    }
 
-   public ProcessingNodeDef unmarshall(InputStream inputStream)
+   public ConfigurationDef unmarshall(InputStream inputStream)
    {
-      ProcessingNodeDef pnd = null;
+      ConfigurationDef pnd = null;
       
       try
       {
-         JAXBContext jaxb = JAXBContext.newInstance(ProcessingNodeDef.class);
+         JAXBContext jaxb = JAXBContext.newInstance(ConfigurationDef.class);
          Unmarshaller unmarshaller = jaxb.createUnmarshaller();         
-         pnd = (ProcessingNodeDef) unmarshaller.unmarshal(inputStream);
+         pnd = (ConfigurationDef) unmarshaller.unmarshal(inputStream);
 
       } catch (Exception e)
       {
@@ -87,11 +87,11 @@
 
    }
 
-   public void marshall(ProcessingNodeDef pnd, OutputStream out)
+   public void marshall(ConfigurationDef pnd, OutputStream out)
    {
       try
       {
-         JAXBContext jaxb = JAXBContext.newInstance(ProcessingNodeDef.class);
+         JAXBContext jaxb = JAXBContext.newInstance(ConfigurationDef.class);
          Marshaller marshaller = jaxb.createMarshaller();         
          marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
          // encoding needs to be different to UTF-8, otherwise the custom encode will not be used

Copied: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ConfigurationDef.java (from rev 231, sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ProcessingNodeDef.java)
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ConfigurationDef.java	                        (rev 0)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ConfigurationDef.java	2008-08-13 11:56:07 UTC (rev 240)
@@ -0,0 +1,147 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This 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 software 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 software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.sam.config;
+
+import javax.xml.bind.annotation.*;
+import java.net.URI;
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+ at XmlRootElement(name = "processingNode", namespace = "http://org.jboss.sam/08/2008/")
+ at XmlType(
+  name = "processingNodeType",
+  namespace = "http://org.jboss.sam/08/2008/",
+  propOrder = {
+    "props", "databases", "inputs", "outputs", "statements"
+    }
+)
+public class ConfigurationDef
+{
+
+   private String name;
+   private URI domain;
+
+   private List<StatementDef> statements = new ArrayList<StatementDef>();
+
+   private List<StreamInputDef> inputs = new ArrayList<StreamInputDef>();
+
+   private List<StreamOutputDef> outputs = new ArrayList<StreamOutputDef>();
+
+   private List<PropertyDef> props = new ArrayList<PropertyDef>();
+
+   private List<DatabaseRefDef> databases = new ArrayList<DatabaseRefDef>();
+
+   public ConfigurationDef()
+   {
+   }
+
+   public ConfigurationDef(String name, URI domain)
+   {
+      this.name = name;
+      this.domain = domain;
+   }
+
+   @XmlAttribute
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+   @XmlAttribute
+   public URI getDomain()
+   {
+      return domain;
+   }
+
+   public void setDomain(URI domain)
+   {
+      this.domain = domain;
+   }
+
+   @XmlElementWrapper(name = "statements")
+   @XmlElement(name="statement")
+   public List<StatementDef> getStatements()
+   {
+      return statements;
+   }
+
+   public void setStatements(List<StatementDef> statements)
+   {
+      this.statements = statements;
+   }
+
+   @XmlElementWrapper(name = "inputs")
+   @XmlElement(name="input")
+   public List<StreamInputDef> getInputs()
+   {
+      return inputs;
+   }
+
+   public void setInputs(List<StreamInputDef> inputs)
+   {
+      this.inputs = inputs;
+   }
+
+   @XmlElementWrapper(name = "outputs")
+   @XmlElement(name="output")
+   public List<StreamOutputDef> getOutputs()
+   {
+      return outputs;
+   }
+
+   public void setOutputs(List<StreamOutputDef> outputs)
+   {
+      this.outputs = outputs;
+   }
+
+   @XmlElementWrapper(name = "properties")
+   @XmlElement(name="property")
+   public List<PropertyDef> getProps()
+   {
+      return props;
+   }
+
+   public void setProps(List<PropertyDef> props)
+   {
+      this.props = props;
+   }
+
+   @XmlElementWrapper(name = "database-references")
+   @XmlElement(name="database-reference")
+   public List<DatabaseRefDef> getDatabases()
+   {
+      return databases;
+   }
+
+   public void setDatabases(List<DatabaseRefDef> databases)
+   {
+      this.databases = databases;
+   }
+}


Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ConfigurationDef.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configurator.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configurator.java	2008-08-13 09:39:31 UTC (rev 239)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/Configurator.java	2008-08-13 11:56:07 UTC (rev 240)
@@ -35,15 +35,15 @@
 public class Configurator
 {
    private ClassLoader loader = Thread.currentThread().getContextClassLoader();
-   private ProcessingNodeDef nodeDef;
+   private ConfigurationDef nodeDef;
    
-   public Configurator(ProcessingNodeDef nodeDef, ClassLoader loader)
+   public Configurator(ConfigurationDef nodeDef, ClassLoader loader)
    {
       this.nodeDef = nodeDef;
       this.loader = loader;
    }
 
-   public Configurator(ProcessingNodeDef nodeDef)
+   public Configurator(ConfigurationDef nodeDef)
    {
       this.nodeDef = nodeDef;
    }

Added: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/DatabaseRefDef.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/DatabaseRefDef.java	                        (rev 0)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/DatabaseRefDef.java	2008-08-13 11:56:07 UTC (rev 240)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This 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 software 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 software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.sam.config;
+
+import javax.xml.bind.annotation.XmlAttribute;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public class DatabaseRefDef
+{
+   private String name;
+   private DatasourceDef datasource;
+
+   public DatabaseRefDef()
+   {
+   }
+
+   public DatabaseRefDef(String name)
+   {
+      this.name = name;
+   }
+
+   @XmlAttribute
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+   public DatasourceDef getDatasource()
+   {
+      return datasource;
+   }
+
+   public void setDatasource(DatasourceDef datasource)
+   {
+      this.datasource = datasource;
+   }
+}


Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/DatabaseRefDef.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/DatasourceDef.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/DatasourceDef.java	                        (rev 0)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/DatasourceDef.java	2008-08-13 11:56:07 UTC (rev 240)
@@ -0,0 +1,95 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This 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 software 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 software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.sam.config;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlAttribute;
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public class DatasourceDef
+{
+   private String name;
+   private String driver;
+   private String url;
+
+   private List<PropertyDef> connectionArgs = new ArrayList<PropertyDef>();
+
+
+   public DatasourceDef()
+   {
+   }
+
+   public DatasourceDef(String name, String driver, String url)
+   {
+      this.name = name;
+      this.driver = driver;
+      this.url = url;
+   }
+
+   @XmlAttribute
+   public String getUrl()
+   {
+      return url;
+   }
+
+   public void setUrl(String url)
+   {
+      this.url = url;
+   }
+
+   @XmlAttribute
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+   @XmlAttribute
+   public String getDriver()
+   {
+      return driver;
+   }
+
+   public void setDriver(String driver)
+   {
+      this.driver = driver;
+   }
+   
+   @XmlElement(name="connection-arg")
+   public List<PropertyDef> getConnectionArgs()
+   {
+      return connectionArgs;
+   }
+
+   public void setConnectionArgs(List<PropertyDef> connectionArgs)
+   {
+      this.connectionArgs = connectionArgs;
+   }
+}


Property changes on: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/DatasourceDef.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Deleted: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ProcessingNodeDef.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ProcessingNodeDef.java	2008-08-13 09:39:31 UTC (rev 239)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/ProcessingNodeDef.java	2008-08-13 11:56:07 UTC (rev 240)
@@ -1,134 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This 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 software 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 software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.sam.config;
-
-import javax.xml.bind.annotation.*;
-import java.net.URI;
-import java.util.List;
-import java.util.ArrayList;
-
-/**
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
- at XmlRootElement(name = "processingNode", namespace = "http://org.jboss.sam/08/2008/")
- at XmlType(
-  name = "processingNodeType",
-  namespace = "http://org.jboss.sam/08/2008/",
-  propOrder = {
-    "props", "inputs", "outputs", "statements"
-    }
-)
-public class ProcessingNodeDef
-{
-
-   private String name;
-   private URI domain;
-
-   private List<StatementDef> statements = new ArrayList<StatementDef>();
-
-   private List<StreamInputDef> inputs = new ArrayList<StreamInputDef>();
-
-   private List<StreamOutputDef> outputs = new ArrayList<StreamOutputDef>();
-
-   private List<PropertyDef> props = new ArrayList<PropertyDef>();
-
-
-   public ProcessingNodeDef()
-   {
-   }
-
-   public ProcessingNodeDef(String name, URI domain)
-   {
-      this.name = name;
-      this.domain = domain;
-   }
-
-   @XmlAttribute
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-
-   @XmlAttribute
-   public URI getDomain()
-   {
-      return domain;
-   }
-
-   public void setDomain(URI domain)
-   {
-      this.domain = domain;
-   }
-
-   @XmlElementWrapper(name = "statements")
-   @XmlElement(name="statement")
-   public List<StatementDef> getStatements()
-   {
-      return statements;
-   }
-
-   public void setStatements(List<StatementDef> statements)
-   {
-      this.statements = statements;
-   }
-
-   @XmlElementWrapper(name = "inputs")
-   @XmlElement(name="input")
-   public List<StreamInputDef> getInputs()
-   {
-      return inputs;
-   }
-
-   public void setInputs(List<StreamInputDef> inputs)
-   {
-      this.inputs = inputs;
-   }
-
-   @XmlElementWrapper(name = "outputs")
-   @XmlElement(name="output")
-   public List<StreamOutputDef> getOutputs()
-   {
-      return outputs;
-   }
-
-   public void setOutputs(List<StreamOutputDef> outputs)
-   {
-      this.outputs = outputs;
-   }
-
-   @XmlElementWrapper(name = "properties")
-   @XmlElement(name="property")
-   public List<PropertyDef> getProps()
-   {
-      return props;
-   }
-
-   public void setProps(List<PropertyDef> props)
-   {
-      this.props = props;
-   }
-}

Modified: sam/trunk/modules/core/src/main/java/org/jboss/sam/config/PropertyDef.java
===================================================================
--- sam/trunk/modules/core/src/main/java/org/jboss/sam/config/PropertyDef.java	2008-08-13 09:39:31 UTC (rev 239)
+++ sam/trunk/modules/core/src/main/java/org/jboss/sam/config/PropertyDef.java	2008-08-13 11:56:07 UTC (rev 240)
@@ -21,21 +21,33 @@
  */
 package org.jboss.sam.config;
 
+import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
 
 /**
  * @author Heiko.Braun <heiko.braun at jboss.com>
  */
- at XmlType(name = "propertyDefType")
+ at XmlType(
+  name = "propertyDefType",
+  propOrder = {"name", "value"}
+)
 public class PropertyDef
 {
    private String name;
    private String value;
 
+
    public PropertyDef()
    {
    }
 
+   public PropertyDef(String name, String value)
+   {
+      this.name = name;
+      this.value = value;
+   }
+
+   @XmlAttribute
    public String getName()
    {
       return name;
@@ -46,6 +58,7 @@
       this.name = name;
    }
 
+   @XmlAttribute
    public String getValue()
    {
       return value;

Modified: sam/trunk/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java
===================================================================
--- sam/trunk/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java	2008-08-13 09:39:31 UTC (rev 239)
+++ sam/trunk/modules/core/src/test/java/org/jboss/test/sam/config/ConfigParserTestCase.java	2008-08-13 11:56:07 UTC (rev 240)
@@ -46,7 +46,7 @@
 
    public void testMarshalling() throws Exception
    {
-      ProcessingNodeDef pnd = new ProcessingNodeDef("BPMEventProcessor", new URI("http://org.jboss.bpm/console"));
+      ConfigurationDef pnd = new ConfigurationDef("BPMEventProcessor", new URI("http://org.jboss.bpm/console"));
 
       // define stream input and outputs
       pnd.getInputs().add( new StreamInputDef("VMInput", InVMStreamInput.class.getName()) );
@@ -58,13 +58,13 @@
         "package org.jboss.test.sam.drools;\n" +
           "\n" +
           "import org.jboss.test.sam.drools.StockTick;\n" +
-          "global org.jboss.sam.internal.drools.DroolsAdapter Drools;\n" +
+          "global org.jboss.sam.internal.drools.SAMAdapter SAM;\n" +
           "\n" +
           "rule \"Check event\"\n" +
           "when\n" +
           "   $st: StockTick(symbol == \"ACME\")\n" +
           "then\n" +
-          "   Drools.getListener(\"VMOutput\").update($st);\n" +
+          "   SAM.getListener(\"VMOutput\").update($st);\n" +
           "end"
       );
 
@@ -74,6 +74,14 @@
 
       pnd.getStatements().add(stmtmDef);
 
+      // database references
+      DatabaseRefDef dbRef = new DatabaseRefDef("hsqlDB");
+      DatasourceDef dsDef = new DatasourceDef("hsqlDS", "org.hsqldb.jdbcDriver", "jdbc:hsqldb:mem:SamTestSetup");
+      dsDef.getConnectionArgs().add(new PropertyDef("user", "sa"));
+      dsDef.getConnectionArgs().add(new PropertyDef("password", ""));
+      dbRef.setDatasource(dsDef);
+      pnd.getDatabases().add(dbRef);
+
       // marshall it
       ByteArrayOutputStream bout = new ByteArrayOutputStream();     
       cfgFactory.marshall(pnd, bout);
@@ -86,7 +94,7 @@
    {
       System.out.println("Config:\n" + new String(XML_CONFIG));
 
-      ProcessingNodeDef pnd = cfgFactory.unmarshall( new ByteArrayInputStream(XML_CONFIG));
+      ConfigurationDef pnd = cfgFactory.unmarshall( new ByteArrayInputStream(XML_CONFIG));
 
       assertNotNull("ProcessingNodeDef not unmarshalled", pnd);
       assertEquals("BPMEventProcessor", pnd.getName());

Modified: sam/trunk/modules/core/src/test/resources/database/test.drl
===================================================================
--- sam/trunk/modules/core/src/test/resources/database/test.drl	2008-08-13 09:39:31 UTC (rev 239)
+++ sam/trunk/modules/core/src/test/resources/database/test.drl	2008-08-13 11:56:07 UTC (rev 240)
@@ -8,9 +8,8 @@
 when
    $query: Query();
    $sqlStream: ArrayList() from collect (
-      String() from SAM.executeSQL("hsqlDB", "SELECT * FROM StockQuotes WHERE symbol=$query.criteria")
+      String() from SAM.executeSQL("hsqlDB", "SELECT * FROM StockQuotes WHERE symbol='"+$query.criteria+"'")
       );
 then
-   System.out.println("Query is: " + $query.criteria);
    SAM.getListener("InVM").update($sqlStream);
 end
\ No newline at end of file

Modified: sam/trunk/pom.xml
===================================================================
--- sam/trunk/pom.xml	2008-08-13 09:39:31 UTC (rev 239)
+++ sam/trunk/pom.xml	2008-08-13 11:56:07 UTC (rev 240)
@@ -21,6 +21,7 @@
       <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.security.args>
       <surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args>
 
+      <dbcp.version>1.2.2</dbcp.version>
       <drools.version>5.0.0.SNAPSHOT</drools.version>
       <junit.version>3.8.2</junit.version>
       <commons-logging.version>1.1</commons-logging.version>
@@ -51,6 +52,12 @@
          </dependency>
 
          <dependency>
+            <groupId>commons-dbcp</groupId>
+            <artifactId>commons-dbcp</artifactId>
+            <version>${dbcp.version}</version>
+         </dependency>
+
+         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>${junit.version}</version>

Modified: sam/trunk/sam-trunk.iml
===================================================================
--- sam/trunk/sam-trunk.iml	2008-08-13 09:39:31 UTC (rev 239)
+++ sam/trunk/sam-trunk.iml	2008-08-13 11:56:07 UTC (rev 240)
@@ -171,6 +171,24 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-pool:commons-pool:jar:1.3:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-pool/commons-pool/1.3/commons-pool-1.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-dbcp:commons-dbcp:jar:1.2.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../.m2/repository/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
   <component name="VcsManagerConfiguration">




More information about the overlord-commits mailing list