openutils-svn Mailing List for openutils (Page 217)

Brought to you by: fcarone, fgiust, molaschi

openutils-svn — developer list with svn commits

You can subscribe to this list here.

2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (4)	Nov (39)	Dec (10)
2007	Jan (19)	Feb (150)	Mar (10)	Apr	May (8)	Jun (11)	Jul (27)	Aug (52)	Sep (35)	Oct (30)	Nov (18)	Dec (4)
2008	Jan (76)	Feb (121)	Mar (39)	Apr (55)	May (18)	Jun (49)	Jul (32)	Aug (4)	Sep (10)	Oct	Nov (3)	Dec (33)
2009	Jan (19)	Feb (87)	Mar (69)	Apr (38)	May (47)	Jun (20)	Jul (5)	Aug (76)	Sep (145)	Oct (34)	Nov (8)	Dec (68)
2010	Jan (150)	Feb (379)	Mar (191)	Apr (100)	May (525)	Jun (269)	Jul (127)	Aug (190)	Sep (190)	Oct (29)	Nov (147)	Dec (83)
2011	Jan (188)	Feb (81)	Mar (43)	Apr (97)	May (63)	Jun (129)	Jul (17)	Aug (124)	Sep (6)	Oct (20)	Nov (67)	Dec (23)
2012	Jan (6)	Feb (14)	Mar (181)	Apr (64)	May (102)	Jun (47)	Jul (26)	Aug (3)	Sep (1)	Oct (14)	Nov (13)	Dec (23)
2013	Jan (4)	Feb (14)	Mar (18)	Apr (14)	May (27)	Jun (27)	Jul (5)	Aug (2)	Sep (74)	Oct (79)	Nov (21)	Dec (97)
2014	Jan (6)	Feb (3)	Mar (8)	Apr	May (5)	Jun	Jul (9)	Aug (6)	Sep (3)	Oct (10)	Nov (6)	Dec
2015	Jan	Feb	Mar (1)	Apr (25)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr (5)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 215 216 217 218 219 .. 227 > >> (Page 217 of 227)

[Openutils-svn] SF.net SVN: openutils: [370] trunk/openutils-testing-junit-dwr/pom.xml

From: <mol...@us...> - 2007-07-24 10:17:21

Revision: 370
          http://svn.sourceforge.net/openutils/?rev=370&view=rev
Author:   molaschi
Date:     2007-07-24 03:17:23 -0700 (Tue, 24 Jul 2007)

Log Message:
-----------
[maven-release-plugin] prepare for next development iteration

Modified Paths:
--------------
    trunk/openutils-testing-junit-dwr/pom.xml

Modified: trunk/openutils-testing-junit-dwr/pom.xml
===================================================================
--- trunk/openutils-testing-junit-dwr/pom.xml	2007-07-24 10:17:18 UTC (rev 369)
+++ trunk/openutils-testing-junit-dwr/pom.xml	2007-07-24 10:17:23 UTC (rev 370)
@@ -8,7 +8,7 @@
   </parent>
   <artifactId>openutils-testing-junit-dwr</artifactId>
   <name>openutils test utils (junit) for dwr</name>
-  <version>1.0</version>
+  <version>1.1-SNAPSHOT</version>
   <description>openutils test utils for dwr</description>
   <dependencies>
     <dependency>
@@ -104,10 +104,4 @@
         <version>1.6R6-candidate2</version>
     </dependency>
   </dependencies>
-
-  <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-dwr-1.0</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-dwr-1.0</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-junit-dwr-1.0</url>
-  </scm>
 </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.

[Openutils-svn] SF.net SVN: openutils: [369] tags

From: <mol...@us...> - 2007-07-24 10:17:15

Revision: 369
          http://svn.sourceforge.net/openutils/?rev=369&view=rev
Author:   molaschi
Date:     2007-07-24 03:17:18 -0700 (Tue, 24 Jul 2007)

Log Message:
-----------
[maven-scm] copy for tag openutils-testing-junit-dwr-1.0

Added Paths:
-----------
    tags/openutils-testing-junit-dwr-1.0/
    tags/openutils-testing-junit-dwr-1.0/pom.xml
    tags/openutils-testing-junit-dwr-1.0/src/

Removed Paths:
-------------
    tags/openutils-testing-junit-dwr-1.0/pom.xml
    tags/openutils-testing-junit-dwr-1.0/src/

Copied: tags/openutils-testing-junit-dwr-1.0 (from rev 367, trunk/openutils-testing-junit-dwr)

Deleted: tags/openutils-testing-junit-dwr-1.0/pom.xml
===================================================================
--- trunk/openutils-testing-junit-dwr/pom.xml	2007-07-24 10:15:55 UTC (rev 367)
+++ tags/openutils-testing-junit-dwr-1.0/pom.xml	2007-07-24 10:17:18 UTC (rev 369)
@@ -1,107 +0,0 @@
-<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.sourceforge.openutils</groupId>
-    <artifactId>openutils</artifactId>
-    <version>3</version>
-    <relativePath>..</relativePath>
-  </parent>
-  <artifactId>openutils-testing-junit-dwr</artifactId>
-  <name>openutils test utils (junit) for dwr</name>
-  <version>1.0-SNAPSHOT</version>
-  <description>openutils test utils for dwr</description>
-  <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.2</version>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.13</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-    </dependency>
-    <dependency>
-          <groupId>httpunit</groupId>
-          <artifactId>httpunit</artifactId>
-          <version>1.6.2</version>
-          <exclusions>
-        <exclusion>
-          <groupId>xerces</groupId>
-          <artifactId>xmlParserAPIs</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xerces</groupId>
-          <artifactId>xercesImpl</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>nekohtml</groupId>
-          <artifactId>nekohtml</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>rhino</groupId>
-          <artifactId>js</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-          </exclusions>
-      </dependency>
-      <dependency>
-          <groupId>tomcat</groupId>
-          <artifactId>jasper-compiler-jdt</artifactId>
-          <version>5.5.12</version>
-      </dependency>
-      <dependency>
-          <groupId>tomcat</groupId>
-          <artifactId>naming-resources</artifactId>
-          <version>5.5.15</version>
-      </dependency>
-      <dependency>
-          <groupId>tomcat</groupId>
-          <artifactId>jasper-runtime</artifactId>
-          <version>5.5.12</version>
-      </dependency>
-      <dependency>
-          <groupId>tomcat</groupId>
-          <artifactId>jasper-compiler</artifactId>
-          <version>5.5.12</version>
-      </dependency>
-      <dependency>
-          <groupId>tomcat</groupId>
-          <artifactId>naming-factory</artifactId>
-          <version>5.5.15</version>
-      </dependency>
-      <dependency>
-          <groupId>javax.servlet</groupId>
-          <artifactId>jstl</artifactId>
-          <version>1.1.2</version>
-      </dependency>
-      <dependency>
-          <groupId>javax.servlet</groupId>
-          <artifactId>jsp-api</artifactId>
-          <version>2.0</version>
-          <scope>provided</scope>
-      </dependency>
-      <dependency>
-          <groupId>commons-el</groupId>
-          <artifactId>commons-el</artifactId>
-          <version>1.0</version>
-      </dependency>
-    <dependency>
-        <groupId>rhino</groupId>
-        <artifactId>js</artifactId>
-        <version>1.6R6-candidate2</version>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file

Copied: tags/openutils-testing-junit-dwr-1.0/pom.xml (from rev 368, trunk/openutils-testing-junit-dwr/pom.xml)
===================================================================
--- tags/openutils-testing-junit-dwr-1.0/pom.xml	                        (rev 0)
+++ tags/openutils-testing-junit-dwr-1.0/pom.xml	2007-07-24 10:17:18 UTC (rev 369)
@@ -0,0 +1,113 @@
+<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.sourceforge.openutils</groupId>
+    <artifactId>openutils</artifactId>
+    <version>3</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>openutils-testing-junit-dwr</artifactId>
+  <name>openutils test utils (junit) for dwr</name>
+  <version>1.0</version>
+  <description>openutils test utils for dwr</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.13</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+    </dependency>
+    <dependency>
+          <groupId>httpunit</groupId>
+          <artifactId>httpunit</artifactId>
+          <version>1.6.2</version>
+          <exclusions>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xmlParserAPIs</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>nekohtml</groupId>
+          <artifactId>nekohtml</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>rhino</groupId>
+          <artifactId>js</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+          </exclusions>
+      </dependency>
+      <dependency>
+          <groupId>tomcat</groupId>
+          <artifactId>jasper-compiler-jdt</artifactId>
+          <version>5.5.12</version>
+      </dependency>
+      <dependency>
+          <groupId>tomcat</groupId>
+          <artifactId>naming-resources</artifactId>
+          <version>5.5.15</version>
+      </dependency>
+      <dependency>
+          <groupId>tomcat</groupId>
+          <artifactId>jasper-runtime</artifactId>
+          <version>5.5.12</version>
+      </dependency>
+      <dependency>
+          <groupId>tomcat</groupId>
+          <artifactId>jasper-compiler</artifactId>
+          <version>5.5.12</version>
+      </dependency>
+      <dependency>
+          <groupId>tomcat</groupId>
+          <artifactId>naming-factory</artifactId>
+          <version>5.5.15</version>
+      </dependency>
+      <dependency>
+          <groupId>javax.servlet</groupId>
+          <artifactId>jstl</artifactId>
+          <version>1.1.2</version>
+      </dependency>
+      <dependency>
+          <groupId>javax.servlet</groupId>
+          <artifactId>jsp-api</artifactId>
+          <version>2.0</version>
+          <scope>provided</scope>
+      </dependency>
+      <dependency>
+          <groupId>commons-el</groupId>
+          <artifactId>commons-el</artifactId>
+          <version>1.0</version>
+      </dependency>
+    <dependency>
+        <groupId>rhino</groupId>
+        <artifactId>js</artifactId>
+        <version>1.6R6-candidate2</version>
+    </dependency>
+  </dependencies>
+
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-dwr-1.0</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-dwr-1.0</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-junit-dwr-1.0</url>
+  </scm>
+</project>
\ No newline at end of file

Copied: tags/openutils-testing-junit-dwr-1.0/src (from rev 366, trunk/openutils-testing-junit-dwr/src)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [368] trunk/openutils-testing-junit-dwr/pom.xml

From: <mol...@us...> - 2007-07-24 10:17:05

Revision: 368
          http://svn.sourceforge.net/openutils/?rev=368&view=rev
Author:   molaschi
Date:     2007-07-24 03:17:06 -0700 (Tue, 24 Jul 2007)

Log Message:
-----------
[maven-release-plugin] prepare release openutils-testing-junit-dwr-1.0

Modified Paths:
--------------
    trunk/openutils-testing-junit-dwr/pom.xml

Modified: trunk/openutils-testing-junit-dwr/pom.xml
===================================================================
--- trunk/openutils-testing-junit-dwr/pom.xml	2007-07-24 10:15:55 UTC (rev 367)
+++ trunk/openutils-testing-junit-dwr/pom.xml	2007-07-24 10:17:06 UTC (rev 368)
@@ -8,7 +8,7 @@
   </parent>
   <artifactId>openutils-testing-junit-dwr</artifactId>
   <name>openutils test utils (junit) for dwr</name>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0</version>
   <description>openutils test utils for dwr</description>
   <dependencies>
     <dependency>
@@ -104,4 +104,10 @@
         <version>1.6R6-candidate2</version>
     </dependency>
   </dependencies>
+
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-dwr-1.0</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-dwr-1.0</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-junit-dwr-1.0</url>
+  </scm>
 </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.

[Openutils-svn] SF.net SVN: openutils: [367] trunk/openutils-testing-junit-dwr/

From: <mol...@us...> - 2007-07-24 10:15:53

Revision: 367
          http://svn.sourceforge.net/openutils/?rev=367&view=rev
Author:   molaschi
Date:     2007-07-24 03:15:55 -0700 (Tue, 24 Jul 2007)

Log Message:
-----------
ignore list

Property Changed:
----------------
    trunk/openutils-testing-junit-dwr/


Property changes on: trunk/openutils-testing-junit-dwr
___________________________________________________________________
Name: svn:ignore
   + .checkstyle
.classpath
.project
.settings
target



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [366] trunk/openutils-deployment/src/main/java/it/ openutils/deployment/spring

From: <fg...@us...> - 2007-07-23 15:03:28

Revision: 366
          http://svn.sourceforge.net/openutils/?rev=366&view=rev
Author:   fgiust
Date:     2007-07-23 08:03:27 -0700 (Mon, 23 Jul 2007)

Log Message:
-----------
added getProperties() and getProperty() to the base envPropertyConfigurer

Modified Paths:
--------------
    trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/DatabaseEnvironmentPropertyConfigurer.java
    trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java

Modified: trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/DatabaseEnvironmentPropertyConfigurer.java
===================================================================
--- trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/DatabaseEnvironmentPropertyConfigurer.java	2007-07-13 08:00:12 UTC (rev 365)
+++ trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/DatabaseEnvironmentPropertyConfigurer.java	2007-07-23 15:03:27 UTC (rev 366)
@@ -39,8 +39,6 @@
 
     private DataSource dataSource;
 
-    private Properties props;
-
     private ApplicationContext applicationContext;
 
     public void setSqlQuery(String sqlQuery)
@@ -64,13 +62,21 @@
     /**
      * Get Spring Context proprieties.
      * @return A properties object containing all spring properties.
-     * @throws IOException Any IOException.
      */
-    public Properties getProperties() throws IOException
+    @Override
+    public Properties getProperties()
     {
-        props = mergeProperties();
+        // loadAndRefresh(); @todo is this needed anymore?
+        return properties;
+    }
+
+    /**
+     * @throws IOException
+     */
+    private void loadAndRefresh() throws IOException
+    {
+        properties = mergeProperties();
         refresh();
-        return props;
     }
 
     /**
@@ -97,7 +103,7 @@
                 String parmValue = rs.getString(2);
 
                 log.debug("Configuring property {}={}", parmName, parmValue);
-                props.put(parmName, parmValue);
+                properties.put(parmName, parmValue);
 
             }
         }
@@ -122,7 +128,7 @@
     }
 
     /**
-     * 
+     *
      */
     private void manuallyLoadDatasource()
     {
@@ -131,7 +137,7 @@
             dataSource = (DataSource) applicationContext.getBean(dataSourceName);
             try
             {
-                props = mergeProperties();
+                properties = mergeProperties();
             }
             catch (IOException e)
             {
@@ -151,7 +157,8 @@
 
         try
         {
-            Properties mergedProps = getProperties();
+            loadAndRefresh();
+            Properties mergedProps = properties;
 
             // Convert the merged properties, if necessary.
             convertProperties(mergedProps);

Modified: trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java
===================================================================
--- trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java	2007-07-13 08:00:12 UTC (rev 365)
+++ trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java	2007-07-23 15:03:27 UTC (rev 366)
@@ -1,6 +1,5 @@
 package it.openutils.deployment.spring;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.InetAddress;
@@ -57,6 +56,11 @@
     private String fileLocation;
 
     /**
+     * Cached properties (super field is private).
+     */
+    protected Properties properties;
+
+    /**
      * Are properties inherited from default configuration? default is true,
      */
     private boolean inherit = true;
@@ -205,6 +209,7 @@
                 log.error("No properties found at {}", replacedLocations);
             }
 
+            this.properties = props;
             super.setProperties(props);
 
         }
@@ -280,4 +285,28 @@
         return StringUtils.EMPTY;
     }
 
+    /**
+     * Returns the Properties loaded by this configurer.
+     * @return Properties
+     */
+    public Properties getProperties()
+    {
+        return properties;
+    }
+
+    /**
+     * Returns a single property.
+     * @param key Property key
+     * @return property value or <code>null</code> if not found.
+     */
+    public String getProperty(String key)
+    {
+        // better be safe, it doesn't hurt
+        if (properties == null)
+        {
+            return null;
+        }
+        return properties.getProperty(key);
+    }
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [365] trunk/openutils-testing-testng-dwr

From: <mol...@us...> - 2007-07-13 08:00:10

Revision: 365
          http://svn.sourceforge.net/openutils/?rev=365&view=rev
Author:   molaschi
Date:     2007-07-13 01:00:12 -0700 (Fri, 13 Jul 2007)

Log Message:
-----------
updated to version 1.6.2 of httpunit

Modified Paths:
--------------
    trunk/openutils-testing-testng-dwr/pom.xml
    trunk/openutils-testing-testng-dwr/src/main/java/it/openutils/testing/testng/dwr/DwrTestCase.java

Modified: trunk/openutils-testing-testng-dwr/pom.xml
===================================================================
--- trunk/openutils-testing-testng-dwr/pom.xml	2007-07-13 07:59:34 UTC (rev 364)
+++ trunk/openutils-testing-testng-dwr/pom.xml	2007-07-13 08:00:12 UTC (rev 365)
@@ -21,16 +21,16 @@
       <artifactId>log4j</artifactId>
       <version>1.2.13</version>
     </dependency>
-	<dependency>
-		<groupId>org.testng</groupId>
-		<artifactId>testng</artifactId>
-		<classifier>jdk15</classifier>
-		<version>5.1</version>
-	</dependency>
+  <dependency>
+    <groupId>org.testng</groupId>
+    <artifactId>testng</artifactId>
+    <classifier>jdk15</classifier>
+    <version>5.1</version>
+  </dependency>
     <dependency>
           <groupId>httpunit</groupId>
           <artifactId>httpunit</artifactId>
-          <version>1.6.1</version>
+          <version>1.6.2</version>
           <exclusions>
         <exclusion>
           <groupId>xerces</groupId>

Modified: trunk/openutils-testing-testng-dwr/src/main/java/it/openutils/testing/testng/dwr/DwrTestCase.java
===================================================================
--- trunk/openutils-testing-testng-dwr/src/main/java/it/openutils/testing/testng/dwr/DwrTestCase.java	2007-07-13 07:59:34 UTC (rev 364)
+++ trunk/openutils-testing-testng-dwr/src/main/java/it/openutils/testing/testng/dwr/DwrTestCase.java	2007-07-13 08:00:12 UTC (rev 365)
@@ -112,6 +112,7 @@
         // ScriptableObject.defineClass(scope, JsJUnitAssert.class);
         context.evaluateString(scope, jsWebEnvironment, "webEnv.js", -1, null);
         scope.put("Test", scope, this);
+        scope.put("Log", scope, log);
 
         // add javascript
         for (String library : jsLibraries)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [364] trunk/openutils-testing-junit-dwr

From: <mol...@us...> - 2007-07-13 07:59:32

Revision: 364
          http://svn.sourceforge.net/openutils/?rev=364&view=rev
Author:   molaschi
Date:     2007-07-13 00:59:34 -0700 (Fri, 13 Jul 2007)

Log Message:
-----------
updated to version 1.6.2 of httpunit

Modified Paths:
--------------
    trunk/openutils-testing-junit-dwr/pom.xml
    trunk/openutils-testing-junit-dwr/src/main/java/it/openutils/testing/junit/dwr/DwrTestCase.java

Modified: trunk/openutils-testing-junit-dwr/pom.xml
===================================================================
--- trunk/openutils-testing-junit-dwr/pom.xml	2007-07-12 17:17:48 UTC (rev 363)
+++ trunk/openutils-testing-junit-dwr/pom.xml	2007-07-13 07:59:34 UTC (rev 364)
@@ -29,7 +29,7 @@
     <dependency>
           <groupId>httpunit</groupId>
           <artifactId>httpunit</artifactId>
-          <version>1.6.1</version>
+          <version>1.6.2</version>
           <exclusions>
         <exclusion>
           <groupId>xerces</groupId>

Modified: trunk/openutils-testing-junit-dwr/src/main/java/it/openutils/testing/junit/dwr/DwrTestCase.java
===================================================================
--- trunk/openutils-testing-junit-dwr/src/main/java/it/openutils/testing/junit/dwr/DwrTestCase.java	2007-07-12 17:17:48 UTC (rev 363)
+++ trunk/openutils-testing-junit-dwr/src/main/java/it/openutils/testing/junit/dwr/DwrTestCase.java	2007-07-13 07:59:34 UTC (rev 364)
@@ -104,6 +104,7 @@
         // ScriptableObject.defineClass(scope, JsJUnitAssert.class);
         context.evaluateString(scope, jsWebEnvironment, "webEnv.js", -1, null);
         scope.put("Test", scope, this);
+        scope.put("Log", scope, log);
 
         // add javascript
         for (String library : jsLibraries)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [363] trunk

From: <mol...@us...> - 2007-07-12 17:17:46

Revision: 363
          http://svn.sourceforge.net/openutils/?rev=363&view=rev
Author:   molaschi
Date:     2007-07-12 10:17:48 -0700 (Thu, 12 Jul 2007)

Log Message:
-----------
Openutils, module openutils-testing-testng-dwr for dwr testing support

Modified Paths:
--------------
    trunk/pom.xml

Added Paths:
-----------
    trunk/openutils-testing-testng-dwr/
    trunk/openutils-testing-testng-dwr/pom.xml
    trunk/openutils-testing-testng-dwr/src/
    trunk/openutils-testing-testng-dwr/src/main/
    trunk/openutils-testing-testng-dwr/src/main/java/
    trunk/openutils-testing-testng-dwr/src/main/java/it/
    trunk/openutils-testing-testng-dwr/src/main/java/it/openutils/
    trunk/openutils-testing-testng-dwr/src/main/java/it/openutils/testing/
    trunk/openutils-testing-testng-dwr/src/main/java/it/openutils/testing/testng/
    trunk/openutils-testing-testng-dwr/src/main/java/it/openutils/testing/testng/dwr/
    trunk/openutils-testing-testng-dwr/src/main/java/it/openutils/testing/testng/dwr/DwrTestCase.java
    trunk/openutils-testing-testng-dwr/src/main/java/it/openutils/testing/testng/dwr/JsException.java
    trunk/openutils-testing-testng-dwr/src/main/java/it/openutils/testing/testng/dwr/XMLHttpRequest.java
    trunk/openutils-testing-testng-dwr/src/main/resources/
    trunk/openutils-testing-testng-dwr/src/main/resources/webEnv.js

Added: trunk/openutils-testing-testng-dwr/pom.xml
===================================================================
--- trunk/openutils-testing-testng-dwr/pom.xml	                        (rev 0)
+++ trunk/openutils-testing-testng-dwr/pom.xml	2007-07-12 17:17:48 UTC (rev 363)
@@ -0,0 +1,108 @@
+<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.sourceforge.openutils</groupId>
+    <artifactId>openutils</artifactId>
+    <version>3</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>openutils-testing-testng-dwr</artifactId>
+  <name>openutils test utils (testng) for dwr</name>
+  <version>1.0-SNAPSHOT</version>
+  <description>openutils test utils for dwr</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.13</version>
+    </dependency>
+	<dependency>
+		<groupId>org.testng</groupId>
+		<artifactId>testng</artifactId>
+		<classifier>jdk15</classifier>
+		<version>5.1</version>
+	</dependency>
+    <dependency>
+          <groupId>httpunit</groupId>
+          <artifactId>httpunit</artifactId>
+          <version>1.6.1</version>
+          <exclusions>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xmlParserAPIs</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>nekohtml</groupId>
+          <artifactId>nekohtml</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>rhino</groupId>
+          <artifactId>js</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+          </exclusions>
+      </dependency>
+      <dependency>
+          <groupId>tomcat</groupId>
+          <artifactId>jasper-compiler-jdt</artifactId>
+          <version>5.5.12</version>
+      </dependency>
+      <dependency>
+          <groupId>tomcat</groupId>
+          <artifactId>naming-resources</artifactId>
+          <version>5.5.15</version>
+      </dependency>
+      <dependency>
+          <groupId>tomcat</groupId>
+          <artifactId>jasper-runtime</artifactId>
+          <version>5.5.12</version>
+      </dependency>
+      <dependency>
+          <groupId>tomcat</groupId>
+          <artifactId>jasper-compiler</artifactId>
+          <version>5.5.12</version>
+      </dependency>
+      <dependency>
+          <groupId>tomcat</groupId>
+          <artifactId>naming-factory</artifactId>
+          <version>5.5.15</version>
+      </dependency>
+      <dependency>
+          <groupId>javax.servlet</groupId>
+          <artifactId>jstl</artifactId>
+          <version>1.1.2</version>
+      </dependency>
+      <dependency>
+          <groupId>javax.servlet</groupId>
+          <artifactId>jsp-api</artifactId>
+          <version>2.0</version>
+          <scope>provided</scope>
+      </dependency>
+      <dependency>
+          <groupId>commons-el</groupId>
+          <artifactId>commons-el</artifactId>
+          <version>1.0</version>
+      </dependency>
+    <dependency>
+        <groupId>rhino</groupId>
+        <artifactId>js</artifactId>
+        <version>1.6R6-candidate2</version>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

Added: trunk/openutils-testing-testng-dwr/src/main/java/it/openutils/testing/testng/dwr/DwrTestCase.java
===================================================================
--- trunk/openutils-testing-testng-dwr/src/main/java/it/openutils/testing/testng/dwr/DwrTestCase.java	                        (rev 0)
+++ trunk/openutils-testing-testng-dwr/src/main/java/it/openutils/testing/testng/dwr/DwrTestCase.java	2007-07-12 17:17:48 UTC (rev 363)
@@ -0,0 +1,301 @@
+package it.openutils.testing.testng.dwr;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+import org.xml.sax.SAXException;
+
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.WebResponse;
+import com.meterware.servletunit.ServletRunner;
+import com.meterware.servletunit.ServletUnitClient;
+
+@Test
+public class DwrTestCase
+{
+
+    private static Logger log = LoggerFactory.getLogger(DwrTestCase.class);
+
+    public static final String SERVLET_UNIT_CLIENT = "SERVLET_UNIT_CLIENT";
+
+    private Context context;
+
+    private Scriptable scope;
+
+    private ServletUnitClient servletUnitClient;
+
+    private ServletRunner servletRunner;
+
+    private String webXmlLocation;
+
+    private String contextPath = "/webapp";
+
+    private List<String> jsLibraries = new ArrayList<String>();
+
+    protected void setAbsoluteWebXmlLocation(String absoluteWebXmlLocation)
+    {
+        this.webXmlLocation = absoluteWebXmlLocation;
+    }
+
+    protected void setContextPath(String contextPath)
+    {
+        this.contextPath = contextPath;
+        if (this.contextPath != null)
+        {
+            this.contextPath = this.contextPath.replace('\\', '/');
+            if (!this.contextPath.startsWith("/"))
+            {
+                this.contextPath = "/" + this.contextPath;
+            }
+        }
+    }
+
+    public void addJsLibrary(String library)
+    {
+        jsLibraries.add(library);
+    }
+
+    @BeforeClass
+    protected void setUpServer() throws Exception
+    {
+        // run httpunit servlet engine
+        servletRunner = new ServletRunner(new File(webXmlLocation), contextPath);
+    }
+
+    @BeforeMethod
+    protected void setUp() throws Exception
+    {
+        servletUnitClient = servletRunner.newClient();
+
+        // init scripting context
+        context = Context.enter();
+        context.setLanguageVersion(Context.VERSION_1_6);
+
+        // store servletUnitClient in context
+        context.putThreadLocal(DwrTestCase.SERVLET_UNIT_CLIENT, servletUnitClient);
+
+        // load js support for window and document
+        String jsWebEnvironment = "";
+        InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("webEnv.js");
+        byte[] buffer = new byte[1024];
+        int read = 0;
+        int length = 1024;
+        while ((read = is.read(buffer, 0, length)) > 0)
+        {
+            jsWebEnvironment += new String(buffer, 0, read);
+        }
+        is.close();
+
+        //
+        scope = context.initStandardObjects();
+        ScriptableObject.defineClass(scope, XMLHttpRequest.class);
+        // ScriptableObject.defineClass(scope, JsJUnitAssert.class);
+        context.evaluateString(scope, jsWebEnvironment, "webEnv.js", -1, null);
+        scope.put("Test", scope, this);
+
+        // add javascript
+        for (String library : jsLibraries)
+        {
+            if (loadLibraryFromLocalServer(library))
+            {
+                log.info("Loaded library from local server: " + library);
+            }
+            else if (loadLibraryFromRemoteServer(library))
+            {
+                log.info("Loaded library from remote server: " + library);
+            }
+            else if (loadLibraryFromClasspath(library))
+            {
+                log.info("Loaded library from classpath: " + library);
+            }
+            else if (loadLibraryFromFileSystem(library))
+            {
+                log.info("Loaded library from filesystem: " + library);
+            }
+            else
+            {
+                log.error("Can't load library " + library);
+                throw new FileNotFoundException(library);
+            }
+        }
+    }
+
+    private boolean loadLibraryFromLocalServer(String library) throws MalformedURLException, SAXException, IOException,
+        URISyntaxException
+    {
+        if (!library.startsWith("http://localhost/"))
+        {
+            return false;
+        }
+
+        WebResponse response = servletUnitClient.getResponse(new GetMethodWebRequest(library));
+        if (response == null)
+        {
+            return false;
+        }
+        URI uri = new URI(library);
+        context.evaluateString(scope, response.getText(), uri.getPath(), -1, null);
+
+        return true;
+    }
+
+    private boolean loadLibraryFromRemoteServer(String library) throws MalformedURLException, SAXException,
+        IOException, URISyntaxException
+    {
+        if (!library.startsWith("http://"))
+        {
+            return false;
+        }
+
+        URL url = new URL(library);
+
+        // connect to library
+        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+        connection.setRequestMethod("GET");
+        connection.setDoInput(true);
+        connection.connect();
+
+        // get response
+        InputStream is = connection.getInputStream();
+        StringBuffer sb = new StringBuffer();
+
+        int i;
+        while ((i = is.read()) != -1)
+        {
+            sb.append((char) i);
+        }
+        is.close();
+        connection.disconnect();
+
+        // put response in context
+        context.evaluateString(scope, sb.toString(), url.getPath(), -1, null);
+
+        return true;
+    }
+
+    private boolean loadLibraryFromClasspath(String library) throws IOException
+    {
+        String js = loadFileFromClassPath(library);
+
+        if (js == null)
+        {
+            return false;
+        }
+
+        context.evaluateString(scope, js, library, -1, null);
+
+        return true;
+    }
+
+    private String loadFileFromClassPath(String file) throws IOException
+    {
+        InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(file);
+        if (is == null)
+        {
+            return null;
+        }
+        byte[] buffer = new byte[1024];
+        int read = 0;
+        String js = "";
+        while ((read = is.read(buffer, 0, buffer.length)) > 0)
+        {
+            js += new String(buffer, 0, read);
+        }
+        is.close();
+
+        return js;
+    }
+
+    private boolean loadLibraryFromFileSystem(String library) throws FileNotFoundException, IOException
+    {
+        String js = loadFileFromFileSystem(library);
+
+        if (js == null)
+        {
+            return false;
+        }
+
+        context.evaluateString(scope, js, library, -1, null);
+
+        return true;
+    }
+
+    private String loadFileFromFileSystem(String file) throws FileNotFoundException, IOException
+    {
+        File f = new File(file);
+        if (!f.exists())
+        {
+            return null;
+        }
+
+        InputStream is = new FileInputStream(f);
+        if (is == null)
+        {
+            return null;
+        }
+        byte[] buffer = new byte[1024];
+        int read = 0;
+        String js = "";
+        while ((read = is.read(buffer, 0, buffer.length)) > 0)
+        {
+            js += new String(buffer, 0, read);
+        }
+        is.close();
+
+        return js;
+    }
+
+    @AfterMethod
+    protected void tearDown() throws Exception
+    {
+        scope = null;
+        Context.exit();
+    }
+
+    @AfterClass
+    protected void tearDownServer() throws Exception
+    {
+        servletRunner.shutDown();
+    }
+
+    public void runScript(String script)
+    {
+        context.evaluateString(scope, script, "inline", -1, null);
+    }
+
+    public void runScriptFile(String scriptFile) throws FileNotFoundException, IOException
+    {
+        String js = loadFileFromClassPath(scriptFile);
+        if (js == null)
+        {
+            js = loadFileFromFileSystem(scriptFile);
+            if (js == null)
+            {
+                throw new FileNotFoundException(scriptFile);
+            }
+        }
+
+        context.evaluateString(scope, js, scriptFile, -1, null);
+    }
+
+}

Added: trunk/openutils-testing-testng-dwr/src/main/java/it/openutils/testing/testng/dwr/JsException.java
===================================================================
--- trunk/openutils-testing-testng-dwr/src/main/java/it/openutils/testing/testng/dwr/JsException.java	                        (rev 0)
+++ trunk/openutils-testing-testng-dwr/src/main/java/it/openutils/testing/testng/dwr/JsException.java	2007-07-12 17:17:48 UTC (rev 363)
@@ -0,0 +1,23 @@
+package it.openutils.testing.testng.dwr;
+
+import org.mozilla.javascript.ScriptableObject;
+
+
+/**
+ * @author mmolaschi
+ * @version $Id: $
+ */
+public class JsException extends ScriptableObject
+{
+
+    @Override
+    public String getClassName()
+    {
+        return "Exception";
+    }
+
+    public void js_constructor(String message) throws Exception
+    {
+        throw new Exception(message);
+    }
+}

Added: trunk/openutils-testing-testng-dwr/src/main/java/it/openutils/testing/testng/dwr/XMLHttpRequest.java
===================================================================
--- trunk/openutils-testing-testng-dwr/src/main/java/it/openutils/testing/testng/dwr/XMLHttpRequest.java	                        (rev 0)
+++ trunk/openutils-testing-testng-dwr/src/main/java/it/openutils/testing/testng/dwr/XMLHttpRequest.java	2007-07-12 17:17:48 UTC (rev 363)
@@ -0,0 +1,479 @@
+//=============================================================================
+//Change History:
+//Date     UserId      Defect          Description
+//----------------------------------------------------------------------------
+//07/02/05 ant         ???             Initial version.
+//09/02/05 ant                         Support both HTTP GET and POST
+//14/02/05 ant                         Fix call backs in functions
+//20/02/05 ant                         Support HTTP HEAD
+//28/02/05 ant                         HTTP basic authentication support
+//
+package it.openutils.testing.testng.dwr;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.io.StringReader;
+import java.net.Authenticator;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.PasswordAuthentication;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.NativeFunction;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.PostMethodWebRequest;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+import com.meterware.servletunit.ServletUnitClient;
+import com.sun.org.apache.xerces.internal.parsers.DOMParser;
+
+
+/**
+ * XMLHttpRequest simulates the Mozilla XMLHttpRequest. Add this class to the Rhino classpath and then define to Rhino
+ * with <code>defineClass('xmlhttp.XMLHttpRequest');</code>
+ * @author <a href="mailto:ant...@uk...">Ant Elder </a>
+ */
+public class XMLHttpRequest extends ScriptableObject
+{
+
+    private String url;
+
+    private String httpMethod;
+
+    private int httpStatus;
+
+    private String httpStatusText;
+
+    private Map requestHeaders;
+
+    private String userName;
+
+    private String password;
+
+    private String responseText;
+
+    private Document responseXML;
+
+    private int readyState;
+
+    private NativeFunction readyStateChangeFunction;
+
+    private boolean asyncFlag;
+
+    private Thread asyncThread;
+
+    private ServletUnitClient suc;
+
+    private WebRequest request;
+
+    private WebResponse response;
+
+    private boolean localRequest = false;
+
+    private HttpURLConnection connection;
+
+    public XMLHttpRequest()
+    {
+    }
+
+    public void jsConstructor()
+    {
+        suc = (ServletUnitClient) Context.getCurrentContext().getThreadLocal(DwrTestCase.SERVLET_UNIT_CLIENT);
+    }
+
+    @Override
+    public String getClassName()
+    {
+        return "XMLHttpRequest";
+    }
+
+    public void jsFunction_setRequestHeader(String headerName, String value)
+    {
+        if (readyState > 1)
+        {
+            throw new IllegalStateException("request already in progress");
+        }
+
+        if (requestHeaders == null)
+        {
+            requestHeaders = new HashMap();
+        }
+
+        requestHeaders.put(headerName, value);
+    }
+
+    public Map<String, String[]> jsFunction_getAllResponseHeaders()
+    {
+        if (readyState < 3)
+        {
+            throw new IllegalStateException("must call send before getting response headers");
+        }
+        Map<String, String[]> map = new HashMap<String, String[]>();
+        for (String name : response.getHeaderFieldNames())
+        {
+            map.put(name.toLowerCase(), response.getHeaderFields(name));
+        }
+        return map;
+    }
+
+    public String jsFunction_getResponseHeader(String headerName)
+    {
+        String theValue = "";
+        String theValues[] = jsFunction_getAllResponseHeaders().get(headerName.toLowerCase());
+        for (String value : theValues)
+        {
+            theValue = ((theValue.length() > 0) ? " " : "") + value;
+        }
+        return theValue;
+    }
+
+    public void jsFunction_open(String httpMethod, String url, boolean asyncFlag, String userName, String password)
+    {
+
+        if (readyState != 0)
+        {
+            throw new IllegalStateException("already open");
+        }
+
+        this.httpMethod = httpMethod;
+
+        this.url = url;
+
+        if (!this.url.startsWith("http://"))
+        {
+            this.url = "http://localhost" + ((this.url.startsWith("/")) ? "" : "/") + this.url;
+        }
+
+        if (this.url.startsWith("http://localhost/"))
+        {
+            this.localRequest = true;
+        }
+        else
+        {
+            this.localRequest = false;
+        }
+
+        this.asyncFlag = asyncFlag;
+
+        if ("undefined".equals(userName) || "".equals(userName))
+        {
+            this.userName = null;
+        }
+        else
+        {
+            this.userName = userName;
+        }
+        if ("undefined".equals(password) || "".equals(password))
+        {
+            this.password = null;
+        }
+        else
+        {
+            this.password = password;
+        }
+        if (this.userName != null)
+        {
+            setAuthenticator();
+        }
+
+        setReadyState(1);
+    }
+
+    private void setAuthenticator()
+    {
+        Authenticator.setDefault(new Authenticator()
+        {
+
+            @Override
+            protected PasswordAuthentication getPasswordAuthentication()
+            {
+                return new PasswordAuthentication(userName, password.toCharArray());
+            }
+        });
+    }
+
+    public void jsFunction_send(Object o) throws SAXException, MalformedURLException, IOException
+    {
+        final String content = (o == null) ? "" : o.toString();
+        /*
+         * if (asyncFlag) { Runnable r = new Runnable() {
+         *
+         * public void run() { try { doSend(content); } catch (SAXException ex) { throw new
+         * NestableRuntimeException(ex); } } }; this.asyncThread = new Thread(r); asyncThread.start(); } else
+         */
+        {
+            doSend(content);
+        }
+    }
+
+    public void jsFunction_abort()
+    {
+        if (asyncThread != null)
+        {
+            asyncThread.interrupt();
+        }
+    }
+
+    /**
+     * @return Returns the readyState.
+     */
+    public int jsGet_readyState()
+    {
+        return readyState;
+    }
+
+    /**
+     * @return Returns the responseText.
+     */
+    public String jsGet_responseText()
+    {
+        if (readyState < 2)
+        {
+            throw new IllegalStateException("request not yet sent");
+        }
+        return responseText;
+    }
+
+    /**
+     * @return Returns the responseXML as a DOM Document.
+     */
+    public Document jsGet_responseXML()
+    {
+        if (responseXML == null && responseText != null)
+        {
+            convertResponse2DOM();
+        }
+        return responseXML;
+    }
+
+    private void convertResponse2DOM()
+    {
+        try
+        {
+
+            DOMParser parser = new DOMParser();
+            StringReader sr = new StringReader(jsGet_responseText());
+            parser.parse(new InputSource(sr));
+            this.responseXML = parser.getDocument();
+
+        }
+        catch (SAXException e)
+        {
+            throw new RuntimeException("ex: " + e, e);
+        }
+        catch (IOException e)
+        {
+            throw new RuntimeException("ex: " + e, e);
+        }
+    }
+
+    /**
+     * @return Returns the htto status.
+     */
+    public int jsGet_status()
+    {
+        return httpStatus;
+    }
+
+    /**
+     * @return Returns the http status text.
+     */
+    public String jsGet_statusText()
+    {
+        return httpStatusText;
+    }
+
+    /**
+     * @return Returns the onreadystatechange.
+     */
+    public Object jsGet_onreadystatechange()
+    {
+        return readyStateChangeFunction;
+    }
+
+    /**
+     * @param onreadystatechange The onreadystatechange to set.
+     */
+    public void jsSet_onreadystatechange(NativeFunction function)
+    {
+        readyStateChangeFunction = function;
+    }
+
+    private void doSend(String content) throws SAXException, MalformedURLException, IOException
+    {
+
+        connect(content);
+
+        setRequestHeaders();
+
+        sendRequest(content);
+
+        if ("POST".equals(this.httpMethod) || "GET".equals(this.httpMethod))
+        {
+            readResponse();
+        }
+
+        setReadyState(4);
+
+    }
+
+    private void connect(String content) throws MalformedURLException, IOException
+    {
+        if (httpMethod == "POST")
+        {
+            if (this.localRequest)
+            {
+                ByteArrayInputStream bis = new ByteArrayInputStream(content.getBytes());
+                request = new PostMethodWebRequest(url, bis, null);
+            }
+            else
+            {
+                URL url = new URL(this.url);
+                connection = (HttpURLConnection) url.openConnection();
+                connection.setDoInput(true);
+                connection.setDoOutput(true);
+                connection.setRequestMethod("POST");
+            }
+        }
+        else
+        {
+            if (this.localRequest)
+            {
+                request = new GetMethodWebRequest("http://localhost/" + url);
+            }
+            else
+            {
+                URL url = new URL(this.url);
+                connection = (HttpURLConnection) url.openConnection();
+                connection.setDoInput(true);
+                connection.setRequestMethod("GET");
+            }
+
+        }
+    }
+
+    private void setRequestHeaders()
+    {
+        if (this.requestHeaders != null)
+        {
+            for (Iterator i = requestHeaders.keySet().iterator(); i.hasNext();)
+            {
+                String header = (String) i.next();
+                String value = (String) requestHeaders.get(header);
+                if (this.localRequest)
+                {
+                    request.setHeaderField(header, value);
+                }
+                else
+                {
+                    connection.setRequestProperty(header, value);
+                }
+            }
+        }
+    }
+
+    private void sendRequest(String content) throws SAXException
+    {
+        try
+        {
+            if ("POST".equals(this.httpMethod) || content.length() > 0)
+            {
+                if (this.localRequest)
+                {
+                    response = suc.getResponse(request);
+                }
+                else
+                {
+                    OutputStreamWriter out = new OutputStreamWriter(connection.getOutputStream(), "ASCII");
+                    out.write(content);
+                    out.flush();
+                    out.close();
+
+                }
+            }
+
+            if (this.localRequest)
+            {
+                httpStatus = response.getResponseCode();
+                httpStatusText = response.getResponseMessage();
+            }
+            else
+            {
+                httpStatus = connection.getResponseCode();
+                httpStatusText = connection.getResponseMessage();
+            }
+        }
+        catch (IOException e)
+        {
+            throw new RuntimeException("IOException: " + e, e);
+        }
+
+        setReadyState(2);
+    }
+
+    private void readResponse()
+    {
+        try
+        {
+            if (this.localRequest)
+            {
+                this.responseText = response.getText();
+            }
+            else
+            {
+                InputStream is = connection.getInputStream();
+                StringBuffer sb = new StringBuffer();
+
+                setReadyState(3);
+
+                int i;
+                while ((i = is.read()) != -1)
+                {
+                    sb.append((char) i);
+                }
+                is.close();
+
+                this.responseText = sb.toString();
+            }
+        }
+        catch (IOException e)
+        {
+            throw new RuntimeException("IOException: " + e, e);
+        }
+    }
+
+    private void setReadyState(int state)
+    {
+        this.readyState = state;
+        callOnreadyStateChange();
+    }
+
+    private void callOnreadyStateChange()
+    {
+        if (readyStateChangeFunction != null)
+        {
+            Context cx = Context.enter();
+            try
+            {
+                Scriptable scope = cx.initStandardObjects();
+                readyStateChangeFunction.call(cx, scope, this, new Object[]{});
+            }
+            finally
+            {
+                Context.exit();
+            }
+        }
+    }
+}
\ No newline at end of file

Added: trunk/openutils-testing-testng-dwr/src/main/resources/webEnv.js
===================================================================
--- trunk/openutils-testing-testng-dwr/src/main/resources/webEnv.js	                        (rev 0)
+++ trunk/openutils-testing-testng-dwr/src/main/resources/webEnv.js	2007-07-12 17:17:48 UTC (rev 363)
@@ -0,0 +1,596 @@
+/*
+ * Simulated browser environment for Rhino
+ *   By John Resig <http://ejohn.org/>
+ * Copyright 2007 John Resig, under the MIT License
+ */
+
+// The window Object
+var window = this;
+
+(function(){
+
+  // Browser Navigator
+
+  window.navigator = {
+    get userAgent(){
+      return "Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.3) Gecko/20070309 Firefox/2.0.0.3";
+    }
+  };
+
+  var curLocation = (new java.io.File("./")).toURL();
+
+  window.__defineSetter__("location", function(url){
+    var xhr = new XMLHttpRequest();
+    xhr.open("GET", url);
+    xhr.onreadystatechange = function(){
+      curLocation = new java.net.URL( curLocation, url );
+      window.document = xhr.responseXML;
+
+      var event = document.createEvent();
+      event.initEvent("load");
+      window.dispatchEvent( event );
+    };
+    xhr.send();
+  });
+
+  window.__defineGetter__("location", function(url){
+    return {
+      get pathname(){
+        if (curLocation.toString().indexOf('?') >= 0)
+        {
+          return curLocation.toString().substring(0, curLocation.toString().indexOf('?'));
+        }
+        return curLocation.toString();
+      },
+      get search(){
+        if (curLocation.toString().indexOf('?') >= 0)
+        {
+          return curLocation.toString().substring(curLocation.toString().indexOf('?') + 1, curLocation.toString().length());
+        }
+        return "";
+      },
+      get protocol(){
+        return curLocation.getProtocol() + ":";
+      },
+      get href(){
+        return curLocation.toString();
+      },
+      toString: function(){
+        return this.href;
+      }
+    };
+  });
+
+  // Timers
+
+  var timers = [];
+
+  window.setTimeout = function(fn, time){
+    var num;
+    return num = setInterval(function(){
+      fn();
+      clearInterval(num);
+    }, time);
+  };
+
+  window.setInterval = function(fn, time){
+    var num = timers.length;
+
+    timers[num] = new java.lang.Thread(new java.lang.Runnable({
+      run: function(){
+        while (true){
+          java.lang.Thread.currentThread().sleep(time);
+          fn();
+        }
+      }
+    }));
+
+    timers[num].start();
+
+    return num;
+  };
+
+  window.clearInterval = function(num){
+    if ( timers[num] ) {
+      timers[num].stop();
+      delete timers[num];
+    }
+  };
+
+  // Window Events
+
+  var events = [{}];
+
+  window.addEventListener = function(type, fn){
+    if ( !this.uuid || this == window ) {
+      this.uuid = events.length;
+      events[this.uuid] = {};
+    }
+
+    if ( !events[this.uuid][type] )
+      events[this.uuid][type] = [];
+
+    if ( events[this.uuid][type].indexOf( fn ) < 0 )
+      events[this.uuid][type].push( fn );
+  };
+
+  window.removeEventListener = function(type, fn){
+     if ( !this.uuid || this == window ) {
+         this.uuid = events.length;
+         events[this.uuid] = {};
+     }
+
+     if ( !events[this.uuid][type] )
+      events[this.uuid][type] = [];
+
+    events[this.uuid][type] =
+      events[this.uuid][type].filter(function(f){
+        return f != fn;
+      });
+  };
+
+  window.dispatchEvent = function(event){
+    if ( event.type ) {
+      if ( this.uuid && events[this.uuid][event.type] ) {
+        var self = this;
+
+        events[this.uuid][event.type].forEach(function(fn){
+          fn.call( self, event );
+        });
+      }
+
+      if ( this["on" + event.type] )
+        this["on" + event.type].call( self, event );
+    }
+  };
+
+  // DOM Document
+
+  window.DOMDocument = function(file){
+    this._file = file;
+    this._dom = Packages.javax.xml.parsers.
+      DocumentBuilderFactory.newInstance()
+        .newDocumentBuilder().parse(file);
+
+    if ( !obj_nodes.containsKey( this._dom ) )
+      obj_nodes.put( this._dom, this );
+  };
+
+  DOMDocument.prototype = {
+    createTextNode: function(text){
+      return makeNode( this._dom.createTextNode(
+        text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;")) );
+    },
+    createElement: function(name){
+      return makeNode( this._dom.createElement(name.toLowerCase()) );
+    },
+    getElementsByTagName: function(name){
+      return new DOMNodeList( this._dom.getElementsByTagName(
+        name.toLowerCase()) );
+    },
+    getElementById: function(id){
+      var elems = this._dom.getElementsByTagName("*");
+
+      for ( var i = 0; i < elems.length; i++ ) {
+        var elem = elems.item(i);
+        if ( elem.getAttribute("id") == id )
+          return makeNode(elem);
+      }
+
+      return null;
+    },
+    get body(){
+      return this.getElementsByTagName("body")[0];
+    },
+    get documentElement(){
+      return makeNode( this._dom.getDocumentElement() );
+    },
+    get ownerDocument(){
+      return null;
+    },
+    addEventListener: window.addEventListener,
+    removeEventListener: window.removeEventListener,
+    dispatchEvent: window.dispatchEvent,
+    get nodeName() {
+      return "#document";
+    },
+    importNode: function(node, deep){
+      return makeNode( this._dom.importNode(node._dom, deep) );
+    },
+    toString: function(){
+      return "Document" + (typeof this._file == "string" ?
+        ": " + this._file : "");
+    },
+    get innerHTML(){
+      return this.documentElement.outerHTML;
+    },
+
+    get defaultView(){
+      return {
+        getComputedStyle: function(elem){
+          return {
+            getPropertyValue: function(prop){
+              prop = prop.replace(/\-(\w)/g,function(m,c){
+                return c.toUpperCase();
+              });
+              var val = elem.style[prop];
+
+              if ( prop == "opacity" && val == "" )
+                val = "1";
+
+              return val;
+            }
+          };
+        }
+      };
+    },
+
+    createEvent: function(){
+      return {
+        type: "",
+        initEvent: function(type){
+          this.type = type;
+        }
+      };
+    }
+  };
+
+  function getDocument(node){
+    return obj_nodes.get(node);
+  }
+
+  // DOM NodeList
+
+  window.DOMNodeList = function(list){
+    this._dom = list;
+    this.length = list.getLength();
+
+    for ( var i = 0; i < this.length; i++ ) {
+      var node = list.item(i);
+      this[i] = makeNode( node );
+    }
+  };
+
+  DOMNodeList.prototype = {
+    toString: function(){
+      return "[ " +
+        Array.prototype.join.call( this, ", " ) + " ]";
+    },
+    get outerHTML(){
+      return Array.prototype.map.call(
+        this, function(node){return node.outerHTML;}).join('');
+    }
+  };
+
+  // DOM Node
+
+  window.DOMNode = function(node){
+    this._dom = node;
+  };
+
+  DOMNode.prototype = {
+    get nodeType(){
+      return this._dom.getNodeType();
+    },
+    get nodeValue(){
+      return this._dom.getNodeValue();
+    },
+    get nodeName() {
+      return this._dom.getNodeName();
+    },
+    cloneNode: function(deep){
+      return makeNode( this._dom.cloneNode(deep) );
+    },
+    get ownerDocument(){
+      return getDocument( this._dom.ownerDocument );
+    },
+    get documentElement(){
+      return makeNode( this._dom.documentElement );
+    },
+    get parentNode() {
+      return makeNode( this._dom.getParentNode() );
+    },
+    get nextSibling() {
+      return makeNode( this._dom.getNextSibling() );
+    },
+    get previousSibling() {
+      return makeNode( this._dom.getPreviousSibling() );
+    },
+    toString: function(){
+      return '"' + this.nodeValue + '"';
+    },
+    get outerHTML(){
+      return this.nodeValue;
+    }
+  };
+
+  // DOM Element
+
+  window.DOMElement = function(elem){
+    this._dom = elem;
+    this.style = {
+      get opacity(){ return this._opacity; },
+      set opacity(val){ this._opacity = val + ""; }
+    };
+
+    // Load CSS info
+    var styles = (this.getAttribute("style") || "").split(/\s*;\s*/);
+
+    for ( var i = 0; i < styles.length; i++ ) {
+      var style = styles[i].split(/\s*:\s*/);
+      if ( style.length == 2 )
+        this.style[ style[0] ] = style[1];
+    }
+  };
+
+  DOMElement.prototype = extend( new DOMNode(), {
+    get nodeName(){
+      return this.tagName.toUpperCase();
+    },
+    get tagName(){
+      return this._dom.getTagName();
+    },
+    toString: function(){
+      return "<" + this.tagName + (this.id ? "#" + this.id : "" ) + ">";
+    },
+    get outerHTML(){
+      var ret = "<" + this.tagName, attr = this.attributes;
+
+      for ( var i in attr )
+        ret += " " + i + "='" + attr[i] + "'";
+
+      if ( this.childNodes.length || this.nodeName == "SCRIPT" )
+        ret += ">" + this.childNodes.outerHTML +
+          "</" + this.tagName + ">";
+      else
+        ret += "/>";
+
+      return ret;
+    },
+
+    get attributes(){
+      var attr = {}, attrs = this._dom.getAttributes();
+
+      for ( var i = 0; i < attrs.getLength(); i++ )
+        attr[ attrs.item(i).nodeName ] = attrs.item(i).nodeValue;
+
+      return attr;
+    },
+
+    get innerHTML(){
+      return this.childNodes.outerHTML;
+    },
+    set innerHTML(html){
+      html = html.replace(/<\/?([A-Z]+)/g, function(m){
+        return m.toLowerCase();
+      });
+
+      var nodes = this.ownerDocument.importNode(
+        new DOMDocument( new java.io.ByteArrayInputStream(
+          (new java.lang.String("<wrap>" + html + "</wrap>"))
+            .getBytes("UTF8"))).documentElement, true).childNodes;
+
+      while (this.firstChild)
+        this.removeChild( this.firstChild );
+
+      for ( var i = 0; i < nodes.length; i++ )
+        this.appendChild( nodes[i] );
+    },
+
+    get textContent(){
+      return nav(this.childNodes);
+
+      function nav(nodes){
+        var str = "";
+        for ( var i = 0; i < nodes.length; i++ )
+          if ( nodes[i].nodeType == 3 )
+            str += nodes[i].nodeValue;
+          else if ( nodes[i].nodeType == 1 )
+            str += nav(nodes[i].childNodes);
+        return str;
+      }
+    },
+    set textContent(text){
+      while (this.firstChild)
+        this.removeChild( this.firstChild );
+      this.appendChild( this.ownerDocument.createTextNode(text));
+    },
+
+    style: {},
+    clientHeight: 0,
+    clientWidth: 0,
+    offsetHeight: 0,
+    offsetWidth: 0,
+
+    get disabled() {
+      var val = this.getAttribute("disabled");
+      return val != "false" && !!val;
+    },
+    set disabled(val) { return this.setAttribute("disabled",val); },
+
+    get checked() {
+      var val = this.getAttribute("checked");
+      return val != "false" && !!val;
+    },
+    set checked(val) { return this.setAttribute("checked",val); },
+
+    get selected() {
+      if ( !this._selectDone ) {
+        this._selectDone = true;
+
+        if ( this.nodeName == "OPTION" && !this.parentNode.getAttribute("multiple") ) {
+          var opt = this.parentNode.getElementsByTagName("option");
+
+          if ( this == opt[0] ) {
+            var select = true;
+
+            for ( var i = 1; i < opt.length; i++ )
+              if ( opt[i].selected ) {
+                select = false;
+                break;
+              }
+
+            if ( select )
+              this.selected = true;
+          }
+        }
+      }
+
+      var val = this.getAttribute("selected");
+      return val != "false" && !!val;
+    },
+    set selected(val) { return this.setAttribute("selected",val); },
+
+    get className() { return this.getAttribute("class") || ""; },
+    set className(val) {
+      return this.setAttribute("class",
+        val.replace(/(^\s*|\s*$)/g,""));
+    },
+
+    get type() { return this.getAttribute("type") || ""; },
+    set type(val) { return this.setAttribute("type",val); },
+
+    get value() { return this.getAttribute("value") || ""; },
+    set value(val) { return this.setAttribute("value",val); },
+
+    get src() { return this.getAttribute("src") || ""; },
+    set src(val) { return this.setAttribute("src",val); },
+
+    get id() { return this.getAttribute("id") || ""; },
+    set id(val) { return this.setAttribute("id",val); },
+
+    getAttribute: function(name){
+      return this._dom.hasAttribute(name) ?
+        new String( this._dom.getAttribute(name) ) :
+        null;
+    },
+    setAttribute: function(name,value){
+      this._dom.setAttribute(name,value);
+    },
+    removeAttribute: function(name){
+      this._dom.removeAttribute(name);
+    },
+
+    get childNodes(){
+      return new DOMNodeList( this._dom.getChildNodes() );
+    },
+    get firstChild(){
+      return makeNode( this._dom.getFirstChild() );
+    },
+    get lastChild(){
+      return makeNode( this._dom.getLastChild() );
+    },
+    appendChild: function(node){
+      this._dom.appendChild( node._dom );
+    },
+    insertBefore: function(node,before){
+      this._dom.insertBefore( node._dom, before ? before._dom : before );
+    },
+    removeChild: function(node){
+      this._dom.removeChild( node._dom );
+    },
+
+    getElementsByTagName: DOMDocument.prototype.getElementsByTagName,
+
+    addEventListener: window.addEventListener,
+    removeEventListener: window.removeEventListener,
+    dispatchEvent: window.dispatchEvent,
+
+    click: function(){
+      var event = document.createEvent();
+      event.initEvent("click");
+      this.dispatchEvent(event);
+    },
+    submit: function(){
+      var event = document.createEvent();
+      event.initEvent("submit");
+      this.dispatchEvent(event);
+    },
+    focus: function(){
+      var event = document.createEvent();
+      event.initEvent("focus");
+      this.dispatchEvent(event);
+    },
+    blur: function(){
+      var event = document.createEvent();
+      event.initEvent("blur");
+      this.dispatchEvent(event);
+    },
+    get elements(){
+      return this.getElementsByTagName("*");
+    },
+    get contentWindow(){
+      return this.nodeName == "IFRAME" ? {
+        document: this.contentDocument
+      } : null;
+    },
+    get contentDocument(){
+      if ( this.nodeName == "IFRAME" ) {
+        if ( !this._doc )
+          this._doc = new DOMDocument(
+            new java.io.ByteArrayInputStream((new java.lang.String(
+            "<html><head><title></title></head><body></body></html>"))
+            .getBytes("UTF8")));
+        return this._doc;
+      } else
+        return null;
+    }
+  });
+
+  // Helper method for extending one object with another
+
+  function extend(a,b) {
+    for ( var i in b ) {
+      var g = b.__lookupGetter__(i), s = b.__lookupSetter__(i);
+
+      if ( g || s ) {
+        if ( g )
+          a.__defineGetter__(i, g);
+        if ( s )
+          a.__defineSetter__(i, s);
+      } else
+        a[i] = b[i];
+    }
+    return a;
+  }
+
+  // Helper method for generating the right
+  // DOM objects based upon the type
+
+  var obj_nodes = new java.util.HashMap();
+
+  function makeNode(node){
+    if ( node ) {
+      if ( !obj_nodes.containsKey( node ) )
+        obj_nodes.put( node, node.getNodeType() ==
+          Packages.org.w3c.dom.Node.ELEMENT_NODE ?
+            new DOMElement( node ) : new DOMNode( node ) );
+
+      return obj_nodes.get(node);
+    } else
+      return null;
+  }
+
+})();
+
+var document = {
+
+  location: window.location,
+  cookie: '',
+
+  getElementById: function(id){
+    if (id == "dwr-debug"){
+      var dbEl = {
+        get innerHTML(){
+          return "";
+        },
+        set innerHTML(value){
+          java.lang.System.out.print(value.replace("<br>", "\n"));
+        }
+      }
+      return dbEl;
+    }
+    return null;
+  }
+
+}

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2007-07-12 15:30:05 UTC (rev 362)
+++ trunk/pom.xml	2007-07-12 17:17:48 UTC (rev 363)
@@ -161,6 +161,7 @@
     <module>openutils-usermanagement-dataobjects</module>
     <module>openutils-usermanagement</module>
     <module>openutils-testing-testng</module>
+    <module>openutils-testing-testng-dwr</module>
     <module>openutils-testing-junit</module>
     <module>openutils-testing-junit-dwr</module>
     <module>openutils-web</module>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [362] trunk

From: <mol...@us...> - 2007-07-12 16:41:08

Revision: 362
          http://svn.sourceforge.net/openutils/?rev=362&view=rev
Author:   molaschi
Date:     2007-07-12 08:30:05 -0700 (Thu, 12 Jul 2007)

Log Message:
-----------
Openutils, module openutils-testing-junit-dwr for dwr testing support

Modified Paths:
--------------
    trunk/pom.xml

Added Paths:
-----------
    trunk/openutils-testing-junit-dwr/
    trunk/openutils-testing-junit-dwr/pom.xml
    trunk/openutils-testing-junit-dwr/src/
    trunk/openutils-testing-junit-dwr/src/main/
    trunk/openutils-testing-junit-dwr/src/main/java/
    trunk/openutils-testing-junit-dwr/src/main/java/it/
    trunk/openutils-testing-junit-dwr/src/main/java/it/openutils/
    trunk/openutils-testing-junit-dwr/src/main/java/it/openutils/testing/
    trunk/openutils-testing-junit-dwr/src/main/java/it/openutils/testing/junit/
    trunk/openutils-testing-junit-dwr/src/main/java/it/openutils/testing/junit/dwr/
    trunk/openutils-testing-junit-dwr/src/main/java/it/openutils/testing/junit/dwr/DwrTestCase.java
    trunk/openutils-testing-junit-dwr/src/main/java/it/openutils/testing/junit/dwr/JsException.java
    trunk/openutils-testing-junit-dwr/src/main/java/it/openutils/testing/junit/dwr/XMLHttpRequest.java
    trunk/openutils-testing-junit-dwr/src/main/resources/
    trunk/openutils-testing-junit-dwr/src/main/resources/webEnv.js

Added: trunk/openutils-testing-junit-dwr/pom.xml
===================================================================
--- trunk/openutils-testing-junit-dwr/pom.xml	                        (rev 0)
+++ trunk/openutils-testing-junit-dwr/pom.xml	2007-07-12 15:30:05 UTC (rev 362)
@@ -0,0 +1,107 @@
+<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.sourceforge.openutils</groupId>
+    <artifactId>openutils</artifactId>
+    <version>3</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>openutils-testing-junit-dwr</artifactId>
+  <name>openutils test utils (junit) for dwr</name>
+  <version>1.0-SNAPSHOT</version>
+  <description>openutils test utils for dwr</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.13</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+    </dependency>
+    <dependency>
+          <groupId>httpunit</groupId>
+          <artifactId>httpunit</artifactId>
+          <version>1.6.1</version>
+          <exclusions>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xmlParserAPIs</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>nekohtml</groupId>
+          <artifactId>nekohtml</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>rhino</groupId>
+          <artifactId>js</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+          </exclusions>
+      </dependency>
+      <dependency>
+          <groupId>tomcat</groupId>
+          <artifactId>jasper-compiler-jdt</artifactId>
+          <version>5.5.12</version>
+      </dependency>
+      <dependency>
+          <groupId>tomcat</groupId>
+          <artifactId>naming-resources</artifactId>
+          <version>5.5.15</version>
+      </dependency>
+      <dependency>
+          <groupId>tomcat</groupId>
+          <artifactId>jasper-runtime</artifactId>
+          <version>5.5.12</version>
+      </dependency>
+      <dependency>
+          <groupId>tomcat</groupId>
+          <artifactId>jasper-compiler</artifactId>
+          <version>5.5.12</version>
+      </dependency>
+      <dependency>
+          <groupId>tomcat</groupId>
+          <artifactId>naming-factory</artifactId>
+          <version>5.5.15</version>
+      </dependency>
+      <dependency>
+          <groupId>javax.servlet</groupId>
+          <artifactId>jstl</artifactId>
+          <version>1.1.2</version>
+      </dependency>
+      <dependency>
+          <groupId>javax.servlet</groupId>
+          <artifactId>jsp-api</artifactId>
+          <version>2.0</version>
+          <scope>provided</scope>
+      </dependency>
+      <dependency>
+          <groupId>commons-el</groupId>
+          <artifactId>commons-el</artifactId>
+          <version>1.0</version>
+      </dependency>
+    <dependency>
+        <groupId>rhino</groupId>
+        <artifactId>js</artifactId>
+        <version>1.6R6-candidate2</version>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

Added: trunk/openutils-testing-junit-dwr/src/main/java/it/openutils/testing/junit/dwr/DwrTestCase.java
===================================================================
--- trunk/openutils-testing-junit-dwr/src/main/java/it/openutils/testing/junit/dwr/DwrTestCase.java	                        (rev 0)
+++ trunk/openutils-testing-junit-dwr/src/main/java/it/openutils/testing/junit/dwr/DwrTestCase.java	2007-07-12 15:30:05 UTC (rev 362)
@@ -0,0 +1,293 @@
+package it.openutils.testing.junit.dwr;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xml.sax.SAXException;
+
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.WebResponse;
+import com.meterware.servletunit.ServletRunner;
+import com.meterware.servletunit.ServletUnitClient;
+
+
+public class DwrTestCase extends TestCase
+{
+
+    private static Logger log = LoggerFactory.getLogger(DwrTestCase.class);
+
+    public static final String SERVLET_UNIT_CLIENT = "SERVLET_UNIT_CLIENT";
+
+    private Context context;
+
+    private Scriptable scope;
+
+    private ServletUnitClient servletUnitClient;
+
+    private ServletRunner servletRunner;
+
+    private String webXmlLocation;
+
+    private String contextPath = "/webapp";
+
+    private List<String> jsLibraries = new ArrayList<String>();
+
+    protected void setAbsoluteWebXmlLocation(String absoluteWebXmlLocation)
+    {
+        this.webXmlLocation = absoluteWebXmlLocation;
+    }
+
+    protected void setContextPath(String contextPath)
+    {
+        this.contextPath = contextPath;
+        if (this.contextPath != null)
+        {
+            this.contextPath = this.contextPath.replace('\\', '/');
+            if (!this.contextPath.startsWith("/"))
+            {
+                this.contextPath = "/" + this.contextPath;
+            }
+        }
+    }
+
+    public void addJsLibrary(String library)
+    {
+        jsLibraries.add(library);
+    }
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        // run httpunit servlet engine
+        servletRunner = new ServletRunner(new File(webXmlLocation), contextPath);
+        servletUnitClient = servletRunner.newClient();
+
+        // init scripting context
+        context = Context.enter();
+        context.setLanguageVersion(Context.VERSION_1_6);
+
+        // store servletUnitClient in context
+        context.putThreadLocal(DwrTestCase.SERVLET_UNIT_CLIENT, servletUnitClient);
+
+        // load js support for window and document
+        String jsWebEnvironment = "";
+        InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("webEnv.js");
+        byte[] buffer = new byte[1024];
+        int read = 0;
+        int length = 1024;
+        while ((read = is.read(buffer, 0, length)) > 0)
+        {
+            jsWebEnvironment += new String(buffer, 0, read);
+        }
+        is.close();
+
+        //
+        scope = context.initStandardObjects();
+        ScriptableObject.defineClass(scope, XMLHttpRequest.class);
+        // ScriptableObject.defineClass(scope, JsJUnitAssert.class);
+        context.evaluateString(scope, jsWebEnvironment, "webEnv.js", -1, null);
+        scope.put("Test", scope, this);
+
+        // add javascript
+        for (String library : jsLibraries)
+        {
+            if (loadLibraryFromLocalServer(library))
+            {
+                log.info("Loaded library from local server: " + library);
+            }
+            else if (loadLibraryFromRemoteServer(library))
+            {
+                log.info("Loaded library from remote server: " + library);
+            }
+            else if (loadLibraryFromClasspath(library))
+            {
+                log.info("Loaded library from classpath: " + library);
+            }
+            else if (loadLibraryFromFileSystem(library))
+            {
+                log.info("Loaded library from filesystem: " + library);
+            }
+            else
+            {
+                log.error("Can't load library " + library);
+                throw new FileNotFoundException(library);
+            }
+        }
+
+        super.setUp();
+    }
+
+    private boolean loadLibraryFromLocalServer(String library) throws MalformedURLException, SAXException, IOException,
+        URISyntaxException
+    {
+        if (!library.startsWith("http://localhost/"))
+        {
+            return false;
+        }
+
+        WebResponse response = servletUnitClient.getResponse(new GetMethodWebRequest(library));
+        if (response == null)
+        {
+            return false;
+        }
+        URI uri = new URI(library);
+        context.evaluateString(scope, response.getText(), uri.getPath(), -1, null);
+
+        return true;
+    }
+
+    private boolean loadLibraryFromRemoteServer(String library) throws MalformedURLException, SAXException,
+        IOException, URISyntaxException
+    {
+        if (!library.startsWith("http://"))
+        {
+            return false;
+        }
+
+        URL url = new URL(library);
+
+        // connect to library
+        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+        connection.setRequestMethod("GET");
+        connection.setDoInput(true);
+        connection.connect();
+
+        // get response
+        InputStream is = connection.getInputStream();
+        StringBuffer sb = new StringBuffer();
+
+        int i;
+        while ((i = is.read()) != -1)
+        {
+            sb.append((char) i);
+        }
+        is.close();
+        connection.disconnect();
+
+        // put response in context
+        context.evaluateString(scope, sb.toString(), url.getPath(), -1, null);
+
+        return true;
+    }
+
+    private boolean loadLibraryFromClasspath(String library) throws IOException
+    {
+        String js = loadFileFromClassPath(library);
+
+        if (js == null)
+        {
+            return false;
+        }
+
+        context.evaluateString(scope, js, library, -1, null);
+
+        return true;
+    }
+
+    private String loadFileFromClassPath(String file) throws IOException
+    {
+        InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(file);
+        if (is == null)
+        {
+            return null;
+        }
+        byte[] buffer = new byte[1024];
+        int read = 0;
+        String js = "";
+        while ((read = is.read(buffer, 0, buffer.length)) > 0)
+        {
+            js += new String(buffer, 0, read);
+        }
+        is.close();
+
+        return js;
+    }
+
+    private boolean loadLibraryFromFileSystem(String library) throws FileNotFoundException, IOException
+    {
+        String js = loadFileFromFileSystem(library);
+
+        if (js == null)
+        {
+            return false;
+        }
+
+        context.evaluateString(scope, js, library, -1, null);
+
+        return true;
+    }
+
+    private String loadFileFromFileSystem(String file) throws FileNotFoundException, IOException
+    {
+        File f = new File(file);
+        if (!f.exists())
+        {
+            return null;
+        }
+
+        InputStream is = new FileInputStream(f);
+        if (is == null)
+        {
+            return null;
+        }
+        byte[] buffer = new byte[1024];
+        int read = 0;
+        String js = "";
+        while ((read = is.read(buffer, 0, buffer.length)) > 0)
+        {
+            js += new String(buffer, 0, read);
+        }
+        is.close();
+
+        return js;
+    }
+
+    @Override
+    protected void tearDown() throws Exception
+    {
+        scope = null;
+        Context.exit();
+
+        servletRunner.shutDown();
+
+        super.tearDown();
+    }
+
+    public void runScript(String script)
+    {
+        context.evaluateString(scope, script, "inline", -1, null);
+    }
+
+    public void runScriptFile(String scriptFile) throws FileNotFoundException, IOException
+    {
+        String js = loadFileFromClassPath(scriptFile);
+        if (js == null)
+        {
+            js = loadFileFromFileSystem(scriptFile);
+            if (js == null)
+            {
+                throw new FileNotFoundException(scriptFile);
+            }
+        }
+
+        context.evaluateString(scope, js, scriptFile, -1, null);
+    }
+
+}

Added: trunk/openutils-testing-junit-dwr/src/main/java/it/openutils/testing/junit/dwr/JsException.java
===================================================================
--- trunk/openutils-testing-junit-dwr/src/main/java/it/openutils/testing/junit/dwr/JsException.java	                        (rev 0)
+++ trunk/openutils-testing-junit-dwr/src/main/java/it/openutils/testing/junit/dwr/JsException.java	2007-07-12 15:30:05 UTC (rev 362)
@@ -0,0 +1,23 @@
+package it.openutils.testing.junit.dwr;
+
+import org.mozilla.javascript.ScriptableObject;
+
+
+/**
+ * @author mmolaschi
+ * @version $Id: $
+ */
+public class JsException extends ScriptableObject
+{
+
+    @Override
+    public String getClassName()
+    {
+        return "Exception";
+    }
+
+    public void js_constructor(String message) throws Exception
+    {
+        throw new Exception(message);
+    }
+}

Added: trunk/openutils-testing-junit-dwr/src/main/java/it/openutils/testing/junit/dwr/XMLHttpRequest.java
===================================================================
--- trunk/openutils-testing-junit-dwr/src/main/java/it/openutils/testing/junit/dwr/XMLHttpRequest.java	                        (rev 0)
+++ trunk/openutils-testing-junit-dwr/src/main/java/it/openutils/testing/junit/dwr/XMLHttpRequest.java	2007-07-12 15:30:05 UTC (rev 362)
@@ -0,0 +1,479 @@
+//=============================================================================
+//Change History:
+//Date     UserId      Defect          Description
+//----------------------------------------------------------------------------
+//07/02/05 ant         ???             Initial version.
+//09/02/05 ant                         Support both HTTP GET and POST
+//14/02/05 ant                         Fix call backs in functions
+//20/02/05 ant                         Support HTTP HEAD
+//28/02/05 ant                         HTTP basic authentication support
+//
+package it.openutils.testing.junit.dwr;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.io.StringReader;
+import java.net.Authenticator;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.PasswordAuthentication;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.NativeFunction;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.PostMethodWebRequest;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+import com.meterware.servletunit.ServletUnitClient;
+import com.sun.org.apache.xerces.internal.parsers.DOMParser;
+
+
+/**
+ * XMLHttpRequest simulates the Mozilla XMLHttpRequest. Add this class to the Rhino classpath and then define to Rhino
+ * with <code>defineClass('xmlhttp.XMLHttpRequest');</code>
+ * @author <a href="mailto:ant...@uk...">Ant Elder </a>
+ */
+public class XMLHttpRequest extends ScriptableObject
+{
+
+    private String url;
+
+    private String httpMethod;
+
+    private int httpStatus;
+
+    private String httpStatusText;
+
+    private Map requestHeaders;
+
+    private String userName;
+
+    private String password;
+
+    private String responseText;
+
+    private Document responseXML;
+
+    private int readyState;
+
+    private NativeFunction readyStateChangeFunction;
+
+    private boolean asyncFlag;
+
+    private Thread asyncThread;
+
+    private ServletUnitClient suc;
+
+    private WebRequest request;
+
+    private WebResponse response;
+
+    private boolean localRequest = false;
+
+    private HttpURLConnection connection;
+
+    public XMLHttpRequest()
+    {
+    }
+
+    public void jsConstructor()
+    {
+        suc = (ServletUnitClient) Context.getCurrentContext().getThreadLocal(DwrTestCase.SERVLET_UNIT_CLIENT);
+    }
+
+    @Override
+    public String getClassName()
+    {
+        return "XMLHttpRequest";
+    }
+
+    public void jsFunction_setRequestHeader(String headerName, String value)
+    {
+        if (readyState > 1)
+        {
+            throw new IllegalStateException("request already in progress");
+        }
+
+        if (requestHeaders == null)
+        {
+            requestHeaders = new HashMap();
+        }
+
+        requestHeaders.put(headerName, value);
+    }
+
+    public Map<String, String[]> jsFunction_getAllResponseHeaders()
+    {
+        if (readyState < 3)
+        {
+            throw new IllegalStateException("must call send before getting response headers");
+        }
+        Map<String, String[]> map = new HashMap<String, String[]>();
+        for (String name : response.getHeaderFieldNames())
+        {
+            map.put(name.toLowerCase(), response.getHeaderFields(name));
+        }
+        return map;
+    }
+
+    public String jsFunction_getResponseHeader(String headerName)
+    {
+        String theValue = "";
+        String theValues[] = jsFunction_getAllResponseHeaders().get(headerName.toLowerCase());
+        for (String value : theValues)
+        {
+            theValue = ((theValue.length() > 0) ? " " : "") + value;
+        }
+        return theValue;
+    }
+
+    public void jsFunction_open(String httpMethod, String url, boolean asyncFlag, String userName, String password)
+    {
+
+        if (readyState != 0)
+        {
+            throw new IllegalStateException("already open");
+        }
+
+        this.httpMethod = httpMethod;
+
+        this.url = url;
+
+        if (!this.url.startsWith("http://"))
+        {
+            this.url = "http://localhost" + ((this.url.startsWith("/")) ? "" : "/") + this.url;
+        }
+
+        if (this.url.startsWith("http://localhost/"))
+        {
+            this.localRequest = true;
+        }
+        else
+        {
+            this.localRequest = false;
+        }
+
+        this.asyncFlag = asyncFlag;
+
+        if ("undefined".equals(userName) || "".equals(userName))
+        {
+            this.userName = null;
+        }
+        else
+        {
+            this.userName = userName;
+        }
+        if ("undefined".equals(password) || "".equals(password))
+        {
+            this.password = null;
+        }
+        else
+        {
+            this.password = password;
+        }
+        if (this.userName != null)
+        {
+            setAuthenticator();
+        }
+
+        setReadyState(1);
+    }
+
+    private void setAuthenticator()
+    {
+        Authenticator.setDefault(new Authenticator()
+        {
+
+            @Override
+            protected PasswordAuthentication getPasswordAuthentication()
+            {
+                return new PasswordAuthentication(userName, password.toCharArray());
+            }
+        });
+    }
+
+    public void jsFunction_send(Object o) throws SAXException, MalformedURLException, IOException
+    {
+        final String content = (o == null) ? "" : o.toString();
+        /*
+         * if (asyncFlag) { Runnable r = new Runnable() {
+         *
+         * public void run() { try { doSend(content); } catch (SAXException ex) { throw new
+         * NestableRuntimeException(ex); } } }; this.asyncThread = new Thread(r); asyncThread.start(); } else
+         */
+        {
+            doSend(content);
+        }
+    }
+
+    public void jsFunction_abort()
+    {
+        if (asyncThread != null)
+        {
+            asyncThread.interrupt();
+        }
+    }
+
+    /**
+     * @return Returns the readyState.
+     */
+    public int jsGet_readyState()
+    {
+        return readyState;
+    }
+
+    /**
+     * @return Returns the responseText.
+     */
+    public String jsGet_responseText()
+    {
+        if (readyState < 2)
+        {
+            throw new IllegalStateException("request not yet sent");
+        }
+        return responseText;
+    }
+
+    /**
+     * @return Returns the responseXML as a DOM Document.
+     */
+    public Document jsGet_responseXML()
+    {
+        if (responseXML == null && responseText != null)
+        {
+            convertResponse2DOM();
+        }
+        return responseXML;
+    }
+
+    private void convertResponse2DOM()
+    {
+        try
+        {
+
+            DOMParser parser = new DOMParser();
+            StringReader sr = new StringReader(jsGet_responseText());
+            parser.parse(new InputSource(sr));
+            this.responseXML = parser.getDocument();
+
+        }
+        catch (SAXException e)
+        {
+            throw new RuntimeException("ex: " + e, e);
+        }
+        catch (IOException e)
+        {
+            throw new RuntimeException("ex: " + e, e);
+        }
+    }
+
+    /**
+     * @return Returns the htto status.
+     */
+    public int jsGet_status()
+    {
+        return httpStatus;
+    }
+
+    /**
+     * @return Returns the http status text.
+     */
+    public String jsGet_statusText()
+    {
+        return httpStatusText;
+    }
+
+    /**
+     * @return Returns the onreadystatechange.
+     */
+    public Object jsGet_onreadystatechange()
+    {
+        return readyStateChangeFunction;
+    }
+
+    /**
+     * @param onreadystatechange The onreadystatechange to set.
+     */
+    public void jsSet_onreadystatechange(NativeFunction function)
+    {
+        readyStateChangeFunction = function;
+    }
+
+    private void doSend(String content) throws SAXException, MalformedURLException, IOException
+    {
+
+        connect(content);
+
+        setRequestHeaders();
+
+        sendRequest(content);
+
+        if ("POST".equals(this.httpMethod) || "GET".equals(this.httpMethod))
+        {
+            readResponse();
+        }
+
+        setReadyState(4);
+
+    }
+
+    private void connect(String content) throws MalformedURLException, IOException
+    {
+        if (httpMethod == "POST")
+        {
+            if (this.localRequest)
+            {
+                ByteArrayInputStream bis = new ByteArrayInputStream(content.getBytes());
+                request = new PostMethodWebRequest(url, bis, null);
+            }
+            else
+            {
+                URL url = new URL(this.url);
+                connection = (HttpURLConnection) url.openConnection();
+                connection.setDoInput(true);
+                connection.setDoOutput(true);
+                connection.setRequestMethod("POST");
+            }
+        }
+        else
+        {
+            if (this.localRequest)
+            {
+                request = new GetMethodWebRequest("http://localhost/" + url);
+            }
+            else
+            {
+                URL url = new URL(this.url);
+                connection = (HttpURLConnection) url.openConnection();
+                connection.setDoInput(true);
+                connection.setRequestMethod("GET");
+            }
+
+        }
+    }
+
+    private void setRequestHeaders()
+    {
+        if (this.requestHeaders != null)
+        {
+            for (Iterator i = requestHeaders.keySet().iterator(); i.hasNext();)
+            {
+                String header = (String) i.next();
+                String value = (String) requestHeaders.get(header);
+                if (this.localRequest)
+                {
+                    request.setHeaderField(header, value);
+                }
+                else
+                {
+                    connection.setRequestProperty(header, value);
+                }
+            }
+        }
+    }
+
+    private void sendRequest(String content) throws SAXException
+    {
+        try
+        {
+            if ("POST".equals(this.httpMethod) || content.length() > 0)
+            {
+                if (this.localRequest)
+                {
+                    response = suc.getResponse(request);
+                }
+                else
+                {
+                    OutputStreamWriter out = new OutputStreamWriter(connection.getOutputStream(), "ASCII");
+                    out.write(content);
+                    out.flush();
+                    out.close();
+
+                }
+            }
+
+            if (this.localRequest)
+            {
+                httpStatus = response.getResponseCode();
+                httpStatusText = response.getResponseMessage();
+            }
+            else
+            {
+                httpStatus = connection.getResponseCode();
+                httpStatusText = connection.getResponseMessage();
+            }
+        }
+        catch (IOException e)
+        {
+            throw new RuntimeException("IOException: " + e, e);
+        }
+
+        setReadyState(2);
+    }
+
+    private void readResponse()
+    {
+        try
+        {
+            if (this.localRequest)
+            {
+                this.responseText = response.getText();
+            }
+            else
+            {
+                InputStream is = connection.getInputStream();
+                StringBuffer sb = new StringBuffer();
+
+                setReadyState(3);
+
+                int i;
+                while ((i = is.read()) != -1)
+                {
+                    sb.append((char) i);
+                }
+                is.close();
+
+                this.responseText = sb.toString();
+            }
+        }
+        catch (IOException e)
+        {
+            throw new RuntimeException("IOException: " + e, e);
+        }
+    }
+
+    private void setReadyState(int state)
+    {
+        this.readyState = state;
+        callOnreadyStateChange();
+    }
+
+    private void callOnreadyStateChange()
+    {
+        if (readyStateChangeFunction != null)
+        {
+            Context cx = Context.enter();
+            try
+            {
+                Scriptable scope = cx.initStandardObjects();
+                readyStateChangeFunction.call(cx, scope, this, new Object[]{});
+            }
+            finally
+            {
+                Context.exit();
+            }
+        }
+    }
+}
\ No newline at end of file

Added: trunk/openutils-testing-junit-dwr/src/main/resources/webEnv.js
===================================================================
--- trunk/openutils-testing-junit-dwr/src/main/resources/webEnv.js	                        (rev 0)
+++ trunk/openutils-testing-junit-dwr/src/main/resources/webEnv.js	2007-07-12 15:30:05 UTC (rev 362)
@@ -0,0 +1,596 @@
+/*
+ * Simulated browser environment for Rhino
+ *   By John Resig <http://ejohn.org/>
+ * Copyright 2007 John Resig, under the MIT License
+ */
+
+// The window Object
+var window = this;
+
+(function(){
+
+  // Browser Navigator
+
+  window.navigator = {
+    get userAgent(){
+      return "Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.3) Gecko/20070309 Firefox/2.0.0.3";
+    }
+  };
+
+  var curLocation = (new java.io.File("./")).toURL();
+
+  window.__defineSetter__("location", function(url){
+    var xhr = new XMLHttpRequest();
+    xhr.open("GET", url);
+    xhr.onreadystatechange = function(){
+      curLocation = new java.net.URL( curLocation, url );
+      window.document = xhr.responseXML;
+
+      var event = document.createEvent();
+      event.initEvent("load");
+      window.dispatchEvent( event );
+    };
+    xhr.send();
+  });
+
+  window.__defineGetter__("location", function(url){
+    return {
+      get pathname(){
+        if (curLocation.toString().indexOf('?') >= 0)
+        {
+          return curLocation.toString().substring(0, curLocation.toString().indexOf('?'));
+        }
+        return curLocation.toString();
+      },
+      get search(){
+        if (curLocation.toString().indexOf('?') >= 0)
+        {
+          return curLocation.toString().substring(curLocation.toString().indexOf('?') + 1, curLocation.toString().length());
+        }
+        return "";
+      },
+      get protocol(){
+        return curLocation.getProtocol() + ":";
+      },
+      get href(){
+        return curLocation.toString();
+      },
+      toString: function(){
+        return this.href;
+      }
+    };
+  });
+
+  // Timers
+
+  var timers = [];
+
+  window.setTimeout = function(fn, time){
+    var num;
+    return num = setInterval(function(){
+      fn();
+      clearInterval(num);
+    }, time);
+  };
+
+  window.setInterval = function(fn, time){
+    var num = timers.length;
+
+    timers[num] = new java.lang.Thread(new java.lang.Runnable({
+      run: function(){
+        while (true){
+          java.lang.Thread.currentThread().sleep(time);
+          fn();
+        }
+      }
+    }));
+
+    timers[num].start();
+
+    return num;
+  };
+
+  window.clearInterval = function(num){
+    if ( timers[num] ) {
+      timers[num].stop();
+      delete timers[num];
+    }
+  };
+
+  // Window Events
+
+  var events = [{}];
+
+  window.addEventListener = function(type, fn){
+    if ( !this.uuid || this == window ) {
+      this.uuid = events.length;
+      events[this.uuid] = {};
+    }
+
+    if ( !events[this.uuid][type] )
+      events[this.uuid][type] = [];
+
+    if ( events[this.uuid][type].indexOf( fn ) < 0 )
+      events[this.uuid][type].push( fn );
+  };
+
+  window.removeEventListener = function(type, fn){
+     if ( !this.uuid || this == window ) {
+         this.uuid = events.length;
+         events[this.uuid] = {};
+     }
+
+     if ( !events[this.uuid][type] )
+      events[this.uuid][type] = [];
+
+    events[this.uuid][type] =
+      events[this.uuid][type].filter(function(f){
+        return f != fn;
+      });
+  };
+
+  window.dispatchEvent = function(event){
+    if ( event.type ) {
+      if ( this.uuid && events[this.uuid][event.type] ) {
+        var self = this;
+
+        events[this.uuid][event.type].forEach(function(fn){
+          fn.call( self, event );
+        });
+      }
+
+      if ( this["on" + event.type] )
+        this["on" + event.type].call( self, event );
+    }
+  };
+
+  // DOM Document
+
+  window.DOMDocument = function(file){
+    this._file = file;
+    this._dom = Packages.javax.xml.parsers.
+      DocumentBuilderFactory.newInstance()
+        .newDocumentBuilder().parse(file);
+
+    if ( !obj_nodes.containsKey( this._dom ) )
+      obj_nodes.put( this._dom, this );
+  };
+
+  DOMDocument.prototype = {
+    createTextNode: function(text){
+      return makeNode( this._dom.createTextNode(
+        text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;")) );
+    },
+    createElement: function(name){
+      return makeNode( this._dom.createElement(name.toLowerCase()) );
+    },
+    getElementsByTagName: function(name){
+      return new DOMNodeList( this._dom.getElementsByTagName(
+        name.toLowerCase()) );
+    },
+    getElementById: function(id){
+      var elems = this._dom.getElementsByTagName("*");
+
+      for ( var i = 0; i < elems.length; i++ ) {
+        var elem = elems.item(i);
+        if ( elem.getAttribute("id") == id )
+          return makeNode(elem);
+      }
+
+      return null;
+    },
+    get body(){
+      return this.getElementsByTagName("body")[0];
+    },
+    get documentElement(){
+      return makeNode( this._dom.getDocumentElement() );
+    },
+    get ownerDocument(){
+      return null;
+    },
+    addEventListener: window.addEventListener,
+    removeEventListener: window.removeEventListener,
+    dispatchEvent: window.dispatchEvent,
+    get nodeName() {
+      return "#document";
+    },
+    importNode: function(node, deep){
+      return makeNode( this._dom.importNode(node._dom, deep) );
+    },
+    toString: function(){
+      return "Document" + (typeof this._file == "string" ?
+        ": " + this._file : "");
+    },
+    get innerHTML(){
+      return this.documentElement.outerHTML;
+    },
+
+    get defaultView(){
+      return {
+        getComputedStyle: function(elem){
+          return {
+            getPropertyValue: function(prop){
+              prop = prop.replace(/\-(\w)/g,function(m,c){
+                return c.toUpperCase();
+              });
+              var val = elem.style[prop];
+
+              if ( prop == "opacity" && val == "" )
+                val = "1";
+
+              return val;
+            }
+          };
+        }
+      };
+    },
+
+    createEvent: function(){
+      return {
+        type: "",
+        initEvent: function(type){
+          this.type = type;
+        }
+      };
+    }
+  };
+
+  function getDocument(node){
+    return obj_nodes.get(node);
+  }
+
+  // DOM NodeList
+
+  window.DOMNodeList = function(list){
+    this._dom = list;
+    this.length = list.getLength();
+
+    for ( var i = 0; i < this.length; i++ ) {
+      var node = list.item(i);
+      this[i] = makeNode( node );
+    }
+  };
+
+  DOMNodeList.prototype = {
+    toString: function(){
+      return "[ " +
+        Array.prototype.join.call( this, ", " ) + " ]";
+    },
+    get outerHTML(){
+      return Array.prototype.map.call(
+        this, function(node){return node.outerHTML;}).join('');
+    }
+  };
+
+  // DOM Node
+
+  window.DOMNode = function(node){
+    this._dom = node;
+  };
+
+  DOMNode.prototype = {
+    get nodeType(){
+      return this._dom.getNodeType();
+    },
+    get nodeValue(){
+      return this._dom.getNodeValue();
+    },
+    get nodeName() {
+      return this._dom.getNodeName();
+    },
+    cloneNode: function(deep){
+      return makeNode( this._dom.cloneNode(deep) );
+    },
+    get ownerDocument(){
+      return getDocument( this._dom.ownerDocument );
+    },
+    get documentElement(){
+      return makeNode( this._dom.documentElement );
+    },
+    get parentNode() {
+      return makeNode( this._dom.getParentNode() );
+    },
+    get nextSibling() {
+      return makeNode( this._dom.getNextSibling() );
+    },
+    get previousSibling() {
+      return makeNode( this._dom.getPreviousSibling() );
+    },
+    toString: function(){
+      return '"' + this.nodeValue + '"';
+    },
+    get outerHTML(){
+      return this.nodeValue;
+    }
+  };
+
+  // DOM Element
+
+  window.DOMElement = function(elem){
+    this._dom = elem;
+    this.style = {
+      get opacity(){ return this._opacity; },
+      set opacity(val){ this._opacity = val + ""; }
+    };
+
+    // Load CSS info
+    var styles = (this.getAttribute("style") || "").split(/\s*;\s*/);
+
+    for ( var i = 0; i < styles.length; i++ ) {
+      var style = styles[i].split(/\s*:\s*/);
+      if ( style.length == 2 )
+        this.style[ style[0] ] = style[1];
+    }
+  };
+
+  DOMElement.prototype = extend( new DOMNode(), {
+    get nodeName(){
+      return this.tagName.toUpperCase();
+    },
+    get tagName(){
+      return this._dom.getTagName();
+    },
+    toString: function(){
+      return "<" + this.tagName + (this.id ? "#" + this.id : "" ) + ">";
+    },
+    get outerHTML(){
+      var ret = "<" + this.tagName, attr = this.attributes;
+
+      for ( var i in attr )
+        ret += " " + i + "='" + attr[i] + "'";
+
+      if ( this.childNodes.length || this.nodeName == "SCRIPT" )
+        ret += ">" + this.childNodes.outerHTML +
+          "</" + this.tagName + ">";
+      else
+        ret += "/>";
+
+      return ret;
+    },
+
+    get attributes(){
+      var attr = {}, attrs = this._dom.getAttributes();
+
+      for ( var i = 0; i < attrs.getLength(); i++ )
+        attr[ attrs.item(i).nodeName ] = attrs.item(i).nodeValue;
+
+      return attr;
+    },
+
+    get innerHTML(){
+      return this.childNodes.outerHTML;
+    },
+    set innerHTML(html){
+      html = html.replace(/<\/?([A-Z]+)/g, function(m){
+        return m.toLowerCase();
+      });
+
+      var nodes = this.ownerDocument.importNode(
+        new DOMDocument( new java.io.ByteArrayInputStream(
+          (new java.lang.String("<wrap>" + html + "</wrap>"))
+            .getBytes("UTF8"))).documentElement, true).childNodes;
+
+      while (this.firstChild)
+        this.removeChild( this.firstChild );
+
+      for ( var i = 0; i < nodes.length; i++ )
+        this.appendChild( nodes[i] );
+    },
+
+    get textContent(){
+      return nav(this.childNodes);
+
+      function nav(nodes){
+        var str = "";
+        for ( var i = 0; i < nodes.length; i++ )
+          if ( nodes[i].nodeType == 3 )
+            str += nodes[i].nodeValue;
+          else if ( nodes[i].nodeType == 1 )
+            str += nav(nodes[i].childNodes);
+        return str;
+      }
+    },
+    set textContent(text){
+      while (this.firstChild)
+        this.removeChild( this.firstChild );
+      this.appendChild( this.ownerDocument.createTextNode(text));
+    },
+
+    style: {},
+    clientHeight: 0,
+    clientWidth: 0,
+    offsetHeight: 0,
+    offsetWidth: 0,
+
+    get disabled() {
+      var val = this.getAttribute("disabled");
+      return val != "false" && !!val;
+    },
+    set disabled(val) { return this.setAttribute("disabled",val); },
+
+    get checked() {
+      var val = this.getAttribute("checked");
+      return val != "false" && !!val;
+    },
+    set checked(val) { return this.setAttribute("checked",val); },
+
+    get selected() {
+      if ( !this._selectDone ) {
+        this._selectDone = true;
+
+        if ( this.nodeName == "OPTION" && !this.parentNode.getAttribute("multiple") ) {
+          var opt = this.parentNode.getElementsByTagName("option");
+
+          if ( this == opt[0] ) {
+            var select = true;
+
+            for ( var i = 1; i < opt.length; i++ )
+              if ( opt[i].selected ) {
+                select = false;
+                break;
+              }
+
+            if ( select )
+              this.selected = true;
+          }
+        }
+      }
+
+      var val = this.getAttribute("selected");
+      return val != "false" && !!val;
+    },
+    set selected(val) { return this.setAttribute("selected",val); },
+
+    get className() { return this.getAttribute("class") || ""; },
+    set className(val) {
+      return this.setAttribute("class",
+        val.replace(/(^\s*|\s*$)/g,""));
+    },
+
+    get type() { return this.getAttribute("type") || ""; },
+    set type(val) { return this.setAttribute("type",val); },
+
+    get value() { return this.getAttribute("value") || ""; },
+    set value(val) { return this.setAttribute("value",val); },
+
+    get src() { return this.getAttribute("src") || ""; },
+    set src(val) { return this.setAttribute("src",val); },
+
+    get id() { return this.getAttribute("id") || ""; },
+    set id(val) { return this.setAttribute("id",val); },
+
+    getAttribute: function(name){
+      return this._dom.hasAttribute(name) ?
+        new String( this._dom.getAttribute(name) ) :
+        null;
+    },
+    setAttribute: function(name,value){
+      this._dom.setAttribute(name,value);
+    },
+    removeAttribute: function(name){
+      this._dom.removeAttribute(name);
+    },
+
+    get childNodes(){
+      return new DOMNodeList( this._dom.getChildNodes() );
+    },
+    get firstChild(){
+      return makeNode( this._dom.getFirstChild() );
+    },
+    get lastChild(){
+      return makeNode( this._dom.getLastChild() );
+    },
+    appendChild: function(node){
+      this._dom.appendChild( node._dom );
+    },
+    insertBefore: function(node,before){
+      this._dom.insertBefore( node._dom, before ? before._dom : before );
+    },
+    removeChild: function(node){
+      this._dom.removeChild( node._dom );
+    },
+
+    getElementsByTagName: DOMDocument.prototype.getElementsByTagName,
+
+    addEventListener: window.addEventListener,
+    removeEventListener: window.removeEventListener,
+    dispatchEvent: window.dispatchEvent,
+
+    click: function(){
+      var event = document.createEvent();
+      event.initEvent("click");
+      this.dispatchEvent(event);
+    },
+    submit: function(){
+      var event = document.createEvent();
+      event.initEvent("submit");
+      this.dispatchEvent(event);
+    },
+    focus: function(){
+      var event = document.createEvent();
+      event.initEvent("focus");
+      this.dispatchEvent(event);
+    },
+    blur: function(){
+      var event = document.createEvent();
+      event.initEvent("blur");
+      this.dispatchEvent(event);
+    },
+    get elements(){
+      return this.getElementsByTagName("*");
+    },
+    get contentWindow(){
+      return this.nodeName == "IFRAME" ? {
+        document: this.contentDocument
+      } : null;
+    },
+    get contentDocument(){
+      if ( this.nodeName == "IFRAME" ) {
+        if ( !this._doc )
+          this._doc = new DOMDocument(
+            new java.io.ByteArrayInputStream((new java.lang.String(
+            "<html><head><title></title></head><body></body></html>"))
+            .getBytes("UTF8")));
+        return this._doc;
+      } else
+        return null;
+    }
+  });
+
+  // Helper method for extending one object with another
+
+  function extend(a,b) {
+    for ( var i in b ) {
+      var g = b.__lookupGetter__(i), s = b.__lookupSetter__(i);
+
+      if ( g || s ) {
+        if ( g )
+          a.__defineGetter__(i, g);
+        if ( s )
+          a.__defineSetter__(i, s);
+      } else
+        a[i] = b[i];
+    }
+    return a;
+  }
+
+  // Helper method for generating the right
+  // DOM objects based upon the type
+
+  var obj_nodes = new java.util.HashMap();
+
+  function makeNode(node){
+    if ( node ) {
+      if ( !obj_nodes.containsKey( node ) )
+        obj_nodes.put( node, node.getNodeType() ==
+          Packages.org.w3c.dom.Node.ELEMENT_NODE ?
+            new DOMElement( node ) : new DOMNode( node ) );
+
+      return obj_nodes.get(node);
+    } else
+      return null;
+  }
+
+})();
+
+var document = {
+
+  location: window.location,
+  cookie: '',
+
+  getElementById: function(id){
+    if (id == "dwr-debug"){
+      var dbEl = {
+        get innerHTML(){
+          return "";
+        },
+        set innerHTML(value){
+          java.lang.System.out.print(value.replace("<br>", "\n"));
+        }
+      }
+      return dbEl;
+    }
+    return null;
+  }
+
+}

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2007-07-12 09:30:32 UTC (rev 361)
+++ trunk/pom.xml	2007-07-12 15:30:05 UTC (rev 362)
@@ -162,6 +162,7 @@
     <module>openutils-usermanagement</module>
     <module>openutils-testing-testng</module>
     <module>openutils-testing-junit</module>
+    <module>openutils-testing-junit-dwr</module>
     <module>openutils-web</module>
     <module>openutils-tags-spring</module>
     <module>openutils-dbmigration</module>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [357] trunk/openutils-dbmigration/src/main/java/it/ openutils/migration/DbSetupManagerImpl.java

From: <fg...@us...> - 2007-07-12 09:46:07

Revision: 357
          http://svn.sourceforge.net/openutils/?rev=357&view=rev
Author:   fgiust
Date:     2007-07-12 02:18:12 -0700 (Thu, 12 Jul 2007)

Log Message:
-----------
reduce logging

Modified Paths:
--------------
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java	2007-07-10 15:15:32 UTC (rev 356)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java	2007-07-12 09:18:12 UTC (rev 357)
@@ -139,7 +139,7 @@
         log.info("Preparing db, checking {} setup tasks.", setupTasks.size());
         for (DbTask task : setupTasks)
         {
-            log.info(task.getDescription());
+            log.debug(task.getDescription());
             task.execute(dataSource);
         }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [361] trunk/openutils-dbmigration/pom.xml

From: <fg...@us...> - 2007-07-12 09:30:30

Revision: 361
          http://svn.sourceforge.net/openutils/?rev=361&view=rev
Author:   fgiust
Date:     2007-07-12 02:30:32 -0700 (Thu, 12 Jul 2007)

Log Message:
-----------
[maven-release-plugin] prepare for next development iteration

Modified Paths:
--------------
    trunk/openutils-dbmigration/pom.xml

Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml	2007-07-12 09:30:27 UTC (rev 360)
+++ trunk/openutils-dbmigration/pom.xml	2007-07-12 09:30:32 UTC (rev 361)
@@ -8,7 +8,7 @@
   </parent>
   <artifactId>openutils-dbmigration</artifactId>
   <name>openutils db migration framework</name>
-  <version>0.7.1</version>
+  <version>0.7.2-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
@@ -84,10 +84,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.7.1</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.7.1</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-dbmigration-0.7.1</url>
-  </scm>
 </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.

[Openutils-svn] SF.net SVN: openutils: [360] tags

From: <fg...@us...> - 2007-07-12 09:30:26

Revision: 360
          http://svn.sourceforge.net/openutils/?rev=360&view=rev
Author:   fgiust
Date:     2007-07-12 02:30:27 -0700 (Thu, 12 Jul 2007)

Log Message:
-----------
[maven-release-plugin]  copy for tag openutils-dbmigration-0.7.1

Added Paths:
-----------
    tags/openutils-dbmigration-0.7.1/
    tags/openutils-dbmigration-0.7.1/pom.xml
    tags/openutils-dbmigration-0.7.1/src/main/java/it/openutils/migration/DbSetupManagerImpl.java
    tags/openutils-dbmigration-0.7.1/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java

Removed Paths:
-------------
    tags/openutils-dbmigration-0.7.1/pom.xml
    tags/openutils-dbmigration-0.7.1/src/main/java/it/openutils/migration/DbSetupManagerImpl.java
    tags/openutils-dbmigration-0.7.1/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java

Copied: tags/openutils-dbmigration-0.7.1 (from rev 353, trunk/openutils-dbmigration)

Deleted: tags/openutils-dbmigration-0.7.1/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml	2007-07-03 22:04:13 UTC (rev 353)
+++ tags/openutils-dbmigration-0.7.1/pom.xml	2007-07-12 09:30:27 UTC (rev 360)
@@ -1,87 +0,0 @@
-<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.sourceforge.openutils</groupId>
-    <artifactId>openutils</artifactId>
-    <version>3</version>
-    <relativePath>..</relativePath>
-  </parent>
-  <artifactId>openutils-dbmigration</artifactId>
-  <name>openutils db migration framework</name>
-  <version>0.8-SNAPSHOT</version>
-  <description />
-  <dependencies>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.3</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>1.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-jdbc</artifactId>
-      <version>2.0.1</version>
-      <exclusions>
-        <exclusion>
-          <groupId>avalon-framework</groupId>
-          <artifactId>avalon-framework</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>logkit</groupId>
-          <artifactId>logkit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-      <version>2.0.1</version>
-      <exclusions>
-        <exclusion>
-          <groupId>avalon-framework</groupId>
-          <artifactId>avalon-framework</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>logkit</groupId>
-          <artifactId>logkit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      <version>2.0.1</version>
-      <exclusions>
-        <exclusion>
-          <groupId>avalon-framework</groupId>
-          <artifactId>avalon-framework</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>logkit</groupId>
-          <artifactId>logkit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.2</version>
-    </dependency>
-    <dependency>
-      <groupId>poi</groupId>
-      <artifactId>poi</artifactId>
-      <version>2.5.1-final-20040804</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.0</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file

Copied: tags/openutils-dbmigration-0.7.1/pom.xml (from rev 359, trunk/openutils-dbmigration/pom.xml)
===================================================================
--- tags/openutils-dbmigration-0.7.1/pom.xml	                        (rev 0)
+++ tags/openutils-dbmigration-0.7.1/pom.xml	2007-07-12 09:30:27 UTC (rev 360)
@@ -0,0 +1,93 @@
+<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.sourceforge.openutils</groupId>
+    <artifactId>openutils</artifactId>
+    <version>3</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>openutils-dbmigration</artifactId>
+  <name>openutils db migration framework</name>
+  <version>0.7.1</version>
+  <description />
+  <dependencies>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.3</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>1.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>2.0.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>avalon-framework</groupId>
+          <artifactId>avalon-framework</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>logkit</groupId>
+          <artifactId>logkit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>2.0.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>avalon-framework</groupId>
+          <artifactId>avalon-framework</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>logkit</groupId>
+          <artifactId>logkit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>2.0.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>avalon-framework</groupId>
+          <artifactId>avalon-framework</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>logkit</groupId>
+          <artifactId>logkit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>poi</groupId>
+      <artifactId>poi</artifactId>
+      <version>2.5.1-final-20040804</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.0</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.7.1</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.7.1</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-dbmigration-0.7.1</url>
+  </scm>
+</project>
\ No newline at end of file

Deleted: tags/openutils-dbmigration-0.7.1/src/main/java/it/openutils/migration/DbSetupManagerImpl.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java	2007-07-03 22:04:13 UTC (rev 353)
+++ tags/openutils-dbmigration-0.7.1/src/main/java/it/openutils/migration/DbSetupManagerImpl.java	2007-07-12 09:30:27 UTC (rev 360)
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
- */
-package it.openutils.migration;
-
-import it.openutils.migration.task.setup.DbTask;
-import it.openutils.migration.task.update.DbUpdate;
-
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.sql.DataSource;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.dao.DataAccessException;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.TransactionCallbackWithoutResult;
-import org.springframework.transaction.support.TransactionTemplate;
-
-
-/**
- * DB setup manager: handles db setup and upgrade.
- * @author fgiust
- * @version $Id$
- */
-public class DbSetupManagerImpl implements DbSetupManager
-{
-
-    /**
-     * Logger.
-     */
-    private static Logger log = LoggerFactory.getLogger(DbSetupManagerImpl.class);
-
-    private List<DbTask> setupTasks;
-
-    private List<DbUpdate> updateTasks;
-
-    private DataSource dataSource;
-
-    private DbVersionManager versionManager;
-
-    private TransactionTemplate transactionTemplate;
-
-    private boolean enabled = true;
-
-    /**
-     * Sets the enabled.
-     * @param enabled the enabled to set
-     */
-    public void setEnabled(boolean enabled)
-    {
-        this.enabled = enabled;
-    }
-
-    /**
-     * Sets the versionManager.
-     * @param versionManager the versionManager to set
-     */
-    public void setVersionManager(DbVersionManager versionManager)
-    {
-        this.versionManager = versionManager;
-    }
-
-    /**
-     * Sets the transactionTemplate.
-     * @param transactionTemplate the transactionTemplate to set
-     */
-    public void setTransactionTemplate(TransactionTemplate transactionTemplate)
-    {
-        this.transactionTemplate = transactionTemplate;
-    }
-
-    /**
-     * Setter for <code>dataSource</code>.
-     * @param dataSource The dataSource to set.
-     */
-    public void setDataSource(DataSource dataSource)
-    {
-        this.dataSource = dataSource;
-    }
-
-    /**
-     * Sets the tasks.
-     * @param setupTasks the tasks to set
-     */
-    public void setSetupTasks(List<DbTask> setupTasks)
-    {
-        this.setupTasks = setupTasks;
-    }
-
-    /**
-     * Sets the updateTasks.
-     * @param updateTasks the updateTasks to set
-     */
-    public void setUpdateTasks(List<DbUpdate> updateTasks)
-    {
-        this.updateTasks = updateTasks;
-    }
-
-    /**
-     * @see it.openutils.dbupdate.DbSetupManager#updateDDL()
-     */
-    public void updateDDL()
-    {
-
-        if (!enabled)
-        {
-            log.info("DB migration is disabled, not running tasks.");
-            return;
-        }
-
-        transactionTemplate.execute(new TransactionCallbackWithoutResult()
-        {
-
-            @Override
-            protected void doInTransactionWithoutResult(TransactionStatus status)
-            {
-                if (setupTasks != null)
-                {
-                    executeSetupTasks();
-                }
-                if (updateTasks != null)
-                {
-                    executeUpdateTasks();
-                }
-            }
-        });
-
-    }
-
-    /**
-     *
-     */
-    private void executeSetupTasks()
-    {
-        log.info("Preparing db, checking {} setup tasks.", setupTasks.size());
-        for (DbTask task : setupTasks)
-        {
-            log.info(task.getDescription());
-            task.execute(dataSource);
-        }
-
-    }
-
-    /**
-     *
-     */
-    private void executeUpdateTasks()
-    {
-
-        int initialVersion = versionManager.getCurrentVersion();
-        int currentVersion = initialVersion;
-
-        Set<DbUpdate> sortedMigrations = new TreeSet<DbUpdate>(new Comparator<DbUpdate>()
-        {
-
-            public int compare(DbUpdate o1, DbUpdate o2)
-            {
-                return o1.getVersion() - o2.getVersion();
-            }
-
-        });
-        sortedMigrations.addAll(updateTasks);
-
-        log.info("Found {} migrations, looking for updates to run...", updateTasks.size());
-        for (DbUpdate update : sortedMigrations)
-        {
-            if (update.getVersion() > currentVersion)
-            {
-                currentVersion = update.getVersion();
-
-                log.info("Preparing migration to version {}. {}", update.getVersion(), update.getDescription());
-                try
-                {
-                    update.execute(dataSource);
-                }
-                catch (DataAccessException e)
-                {
-                    log.error("\n***********\n\n\nDatabase upgrade from version "
-                        + initialVersion
-                        + " to version "
-                        + currentVersion
-                        + " FAILED!\n\n\n***********\n", e);
-                }
-                versionManager.setNewVersion(currentVersion);
-            }
-        }
-        if (currentVersion != initialVersion)
-        {
-            log.info("Database upgraded from version {} to version {}", initialVersion, currentVersion);
-        }
-        else
-        {
-            log.info("No Database upgrade is needed. Current version is {} ", initialVersion);
-        }
-        // org.springframework.jdbc.BadSqlGrammarException:
-        // java.sql.SQLException: ORA-00959: tablespace 'XDM_DATA' inesistente
-
-    }
-}

Copied: tags/openutils-dbmigration-0.7.1/src/main/java/it/openutils/migration/DbSetupManagerImpl.java (from rev 357, trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java)
===================================================================
--- tags/openutils-dbmigration-0.7.1/src/main/java/it/openutils/migration/DbSetupManagerImpl.java	                        (rev 0)
+++ tags/openutils-dbmigration-0.7.1/src/main/java/it/openutils/migration/DbSetupManagerImpl.java	2007-07-12 09:30:27 UTC (rev 360)
@@ -0,0 +1,203 @@
+/*
+ * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.migration;
+
+import it.openutils.migration.task.setup.DbTask;
+import it.openutils.migration.task.update.DbUpdate;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.sql.DataSource;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.dao.DataAccessException;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
+
+
+/**
+ * DB setup manager: handles db setup and upgrade.
+ * @author fgiust
+ * @version $Id$
+ */
+public class DbSetupManagerImpl implements DbSetupManager
+{
+
+    /**
+     * Logger.
+     */
+    private static Logger log = LoggerFactory.getLogger(DbSetupManagerImpl.class);
+
+    private List<DbTask> setupTasks;
+
+    private List<DbUpdate> updateTasks;
+
+    private DataSource dataSource;
+
+    private DbVersionManager versionManager;
+
+    private TransactionTemplate transactionTemplate;
+
+    private boolean enabled = true;
+
+    /**
+     * Sets the enabled.
+     * @param enabled the enabled to set
+     */
+    public void setEnabled(boolean enabled)
+    {
+        this.enabled = enabled;
+    }
+
+    /**
+     * Sets the versionManager.
+     * @param versionManager the versionManager to set
+     */
+    public void setVersionManager(DbVersionManager versionManager)
+    {
+        this.versionManager = versionManager;
+    }
+
+    /**
+     * Sets the transactionTemplate.
+     * @param transactionTemplate the transactionTemplate to set
+     */
+    public void setTransactionTemplate(TransactionTemplate transactionTemplate)
+    {
+        this.transactionTemplate = transactionTemplate;
+    }
+
+    /**
+     * Setter for <code>dataSource</code>.
+     * @param dataSource The dataSource to set.
+     */
+    public void setDataSource(DataSource dataSource)
+    {
+        this.dataSource = dataSource;
+    }
+
+    /**
+     * Sets the tasks.
+     * @param setupTasks the tasks to set
+     */
+    public void setSetupTasks(List<DbTask> setupTasks)
+    {
+        this.setupTasks = setupTasks;
+    }
+
+    /**
+     * Sets the updateTasks.
+     * @param updateTasks the updateTasks to set
+     */
+    public void setUpdateTasks(List<DbUpdate> updateTasks)
+    {
+        this.updateTasks = updateTasks;
+    }
+
+    /**
+     * @see it.openutils.dbupdate.DbSetupManager#updateDDL()
+     */
+    public void updateDDL()
+    {
+
+        if (!enabled)
+        {
+            log.info("DB migration is disabled, not running tasks.");
+            return;
+        }
+
+        transactionTemplate.execute(new TransactionCallbackWithoutResult()
+        {
+
+            @Override
+            protected void doInTransactionWithoutResult(TransactionStatus status)
+            {
+                if (setupTasks != null)
+                {
+                    executeSetupTasks();
+                }
+                if (updateTasks != null)
+                {
+                    executeUpdateTasks();
+                }
+            }
+        });
+
+    }
+
+    /**
+     *
+     */
+    private void executeSetupTasks()
+    {
+        log.info("Preparing db, checking {} setup tasks.", setupTasks.size());
+        for (DbTask task : setupTasks)
+        {
+            log.debug(task.getDescription());
+            task.execute(dataSource);
+        }
+
+    }
+
+    /**
+     *
+     */
+    private void executeUpdateTasks()
+    {
+
+        int initialVersion = versionManager.getCurrentVersion();
+        int currentVersion = initialVersion;
+
+        Set<DbUpdate> sortedMigrations = new TreeSet<DbUpdate>(new Comparator<DbUpdate>()
+        {
+
+            public int compare(DbUpdate o1, DbUpdate o2)
+            {
+                return o1.getVersion() - o2.getVersion();
+            }
+
+        });
+        sortedMigrations.addAll(updateTasks);
+
+        log.info("Found {} migrations, looking for updates to run...", updateTasks.size());
+        for (DbUpdate update : sortedMigrations)
+        {
+            if (update.getVersion() > currentVersion)
+            {
+                currentVersion = update.getVersion();
+
+                log.info("Preparing migration to version {}. {}", update.getVersion(), update.getDescription());
+                try
+                {
+                    update.execute(dataSource);
+                }
+                catch (DataAccessException e)
+                {
+                    log.error("\n***********\n\n\nDatabase upgrade from version "
+                        + initialVersion
+                        + " to version "
+                        + currentVersion
+                        + " FAILED!\n\n\n***********\n", e);
+                }
+                versionManager.setNewVersion(currentVersion);
+            }
+        }
+        if (currentVersion != initialVersion)
+        {
+            log.info("Database upgraded from version {} to version {}", initialVersion, currentVersion);
+        }
+        else
+        {
+            log.info("No Database upgrade is needed. Current version is {} ", initialVersion);
+        }
+        // org.springframework.jdbc.BadSqlGrammarException:
+        // java.sql.SQLException: ORA-00959: tablespace 'XDM_DATA' inesistente
+
+    }
+}

Deleted: tags/openutils-dbmigration-0.7.1/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java	2007-07-03 22:04:13 UTC (rev 353)
+++ tags/openutils-dbmigration-0.7.1/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java	2007-07-12 09:30:27 UTC (rev 360)
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
- */
-package it.openutils.migration.task.setup;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-
-import javax.sql.DataSource;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.io.Resource;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
-
-
-/**
- * @author fgiust
- * @version $Id$
- */
-public class GenericScriptBasedConditionalTask implements DbTask
-{
-
-    /**
-     * Logger.
-     */
-    private static Logger log = LoggerFactory.getLogger(GenericScriptBasedConditionalTask.class);
-
-    /**
-     * Script list to execute
-     */
-    protected List<Resource> scripts;
-
-    private String check;
-
-    /**
-     * Sets the scripts.
-     * @param scripts the scripts to set
-     */
-    public void setScripts(List<Resource> scripts)
-    {
-        this.scripts = scripts;
-    }
-
-    /**
-     * Sets the check.
-     * @param check the check to set
-     */
-    public void setCheck(String check)
-    {
-        this.check = check;
-    }
-
-    /**
-     * @param script The script resource
-     * @return The script name
-     */
-    protected String objectNameFromFileName(Resource script)
-    {
-        return StringUtils.substringBeforeLast(script.getFilename(), ".");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getDescription()
-    {
-        if (scripts == null)
-        {
-            return "Nothing to do, no scripts configured";
-        }
-
-        StringBuffer result = new StringBuffer();
-        if (!scripts.isEmpty())
-        {
-            result.append("Checking :\n");
-            for (Resource script : scripts)
-            {
-                result.append("  - " + objectNameFromFileName(script) + "\n");
-            }
-
-        }
-        return result.toString();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void execute(DataSource dataSource)
-    {
-
-        SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
-
-        for (Resource script : scripts)
-        {
-            int result = jdbcTemplate.queryForInt(check, this.objectNameFromFileName(script));
-            if (result == 0)
-            {
-                if (script == null || !script.exists())
-                {
-                    log.error("Unable to execute db task \"{}\", script \"{}\" not found.", getDescription(), script);
-                    return;
-                }
-
-                String scriptContent;
-                InputStream is = null;
-
-                try
-                {
-                    is = script.getInputStream();
-                    scriptContent = IOUtils.toString(is, "UTF8");
-                }
-                catch (IOException e)
-                {
-                    log.error(
-                        "Unable to execute db task \"{}\", script \"{}\" can't be read.",
-                        getDescription(),
-                        script);
-                    return;
-                }
-                finally
-                {
-                    IOUtils.closeQuietly(is);
-                }
-
-                String[] ddls = StringUtils.split(scriptContent, ";");
-
-                for (String ddl : ddls)
-                {
-                    if (StringUtils.isNotBlank(ddl))
-                    {
-                        log.debug("Executing:\n{}", ddl);
-                        jdbcTemplate.update(ddl);
-                    }
-                }
-            }
-        }
-
-    }
-}

Copied: tags/openutils-dbmigration-0.7.1/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java (from rev 358, trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java)
===================================================================
--- tags/openutils-dbmigration-0.7.1/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java	                        (rev 0)
+++ tags/openutils-dbmigration-0.7.1/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java	2007-07-12 09:30:27 UTC (rev 360)
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.migration.task.setup;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.io.Resource;
+import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class GenericScriptBasedConditionalTask implements DbTask
+{
+
+    /**
+     * Logger.
+     */
+    private static Logger log = LoggerFactory.getLogger(GenericScriptBasedConditionalTask.class);
+
+    /**
+     * Script list to execute
+     */
+    protected List<Resource> scripts;
+
+    /**
+     * Check statement.
+     */
+    protected String check;
+
+    /**
+     * Custom description.
+     */
+    protected String description;
+
+    /**
+     * Sets the scripts.
+     * @param scripts the scripts to set
+     */
+    public void setScripts(List<Resource> scripts)
+    {
+        this.scripts = scripts;
+    }
+
+    /**
+     * Sets the check.
+     * @param check the check to set
+     */
+    public void setCheck(String check)
+    {
+        this.check = check;
+    }
+
+    /**
+     * Sets the description.
+     * @param description the description to set
+     */
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
+    /**
+     * @param script The script resource
+     * @return The script name
+     */
+    protected String objectNameFromFileName(Resource script)
+    {
+        return StringUtils.substringBeforeLast(script.getFilename(), ".");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String getDescription()
+    {
+        if (StringUtils.isNotEmpty(description))
+        {
+            return description;
+        }
+
+        if (scripts == null)
+        {
+            return "Nothing to do, no scripts configured";
+        }
+
+        StringBuffer result = new StringBuffer();
+        if (!scripts.isEmpty())
+        {
+            result.append("Checking :\n");
+            for (Resource script : scripts)
+            {
+                result.append("  - " + objectNameFromFileName(script) + "\n");
+            }
+
+        }
+        return result.toString();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void execute(DataSource dataSource)
+    {
+
+        SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+
+        for (Resource script : scripts)
+        {
+            int result = jdbcTemplate.queryForInt(check, this.objectNameFromFileName(script));
+            if (result == 0)
+            {
+                if (script == null || !script.exists())
+                {
+                    log.error("Unable to execute db task \"{}\", script \"{}\" not found.", getDescription(), script);
+                    return;
+                }
+
+                String scriptContent;
+                InputStream is = null;
+
+                try
+                {
+                    is = script.getInputStream();
+                    scriptContent = IOUtils.toString(is, "UTF8");
+                }
+                catch (IOException e)
+                {
+                    log.error(
+                        "Unable to execute db task \"{}\", script \"{}\" can't be read.",
+                        getDescription(),
+                        script);
+                    return;
+                }
+                finally
+                {
+                    IOUtils.closeQuietly(is);
+                }
+
+                String[] ddls = StringUtils.split(scriptContent, ";");
+
+                for (String ddl : ddls)
+                {
+                    if (StringUtils.isNotBlank(ddl))
+                    {
+                        log.debug("Executing:\n{}", ddl);
+                        jdbcTemplate.update(ddl);
+                    }
+                }
+            }
+        }
+
+    }
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [359] trunk/openutils-dbmigration/pom.xml

From: <fg...@us...> - 2007-07-12 09:30:14

Revision: 359
          http://svn.sourceforge.net/openutils/?rev=359&view=rev
Author:   fgiust
Date:     2007-07-12 02:30:17 -0700 (Thu, 12 Jul 2007)

Log Message:
-----------
[maven-release-plugin] prepare release openutils-dbmigration-0.7.1

Modified Paths:
--------------
    trunk/openutils-dbmigration/pom.xml

Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml	2007-07-12 09:29:18 UTC (rev 358)
+++ trunk/openutils-dbmigration/pom.xml	2007-07-12 09:30:17 UTC (rev 359)
@@ -8,7 +8,7 @@
   </parent>
   <artifactId>openutils-dbmigration</artifactId>
   <name>openutils db migration framework</name>
-  <version>0.8-SNAPSHOT</version>
+  <version>0.7.1</version>
   <description />
   <dependencies>
     <dependency>
@@ -84,4 +84,10 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.7.1</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.7.1</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-dbmigration-0.7.1</url>
+  </scm>
 </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.

[Openutils-svn] SF.net SVN: openutils: [358] trunk/openutils-dbmigration/src/main/java/it/ openutils/migration/task/setup/GenericScriptBasedConditionalTask.java

From: <fg...@us...> - 2007-07-12 09:29:18

Revision: 358
          http://svn.sourceforge.net/openutils/?rev=358&view=rev
Author:   fgiust
Date:     2007-07-12 02:29:18 -0700 (Thu, 12 Jul 2007)

Log Message:
-----------
allow a custom description

Modified Paths:
--------------
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java	2007-07-12 09:18:12 UTC (rev 357)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java	2007-07-12 09:29:18 UTC (rev 358)
@@ -34,9 +34,17 @@
      */
     protected List<Resource> scripts;
 
-    private String check;
+    /**
+     * Check statement.
+     */
+    protected String check;
 
     /**
+     * Custom description.
+     */
+    protected String description;
+
+    /**
      * Sets the scripts.
      * @param scripts the scripts to set
      */
@@ -55,6 +63,15 @@
     }
 
     /**
+     * Sets the description.
+     * @param description the description to set
+     */
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
+    /**
      * @param script The script resource
      * @return The script name
      */
@@ -68,6 +85,11 @@
      */
     public String getDescription()
     {
+        if (StringUtils.isNotEmpty(description))
+        {
+            return description;
+        }
+
         if (scripts == null)
         {
             return "Nothing to do, no scripts configured";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [356] trunk/openutils-testing-testng/pom.xml

From: <fg...@us...> - 2007-07-10 15:15:29

Revision: 356
          http://svn.sourceforge.net/openutils/?rev=356&view=rev
Author:   fgiust
Date:     2007-07-10 08:15:32 -0700 (Tue, 10 Jul 2007)

Log Message:
-----------
[maven-release-plugin] prepare for next development iteration

Modified Paths:
--------------
    trunk/openutils-testing-testng/pom.xml

Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml	2007-07-10 15:15:27 UTC (rev 355)
+++ trunk/openutils-testing-testng/pom.xml	2007-07-10 15:15:32 UTC (rev 356)
@@ -8,7 +8,7 @@
 	</parent>
 	<artifactId>openutils-testing-testng</artifactId>
 	<name>openutils test utils (testng)</name>
-	<version>1.1.2</version>
+	<version>1.1.3-SNAPSHOT</version>
 	<description>openutils test utils</description>
 	<dependencies>
 		<dependency>
@@ -56,10 +56,4 @@
 			<version>5.1</version>
 		</dependency>
 	</dependencies>
-
-  <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-testng-1.1.2</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-testng-1.1.2</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-testng-1.1.2</url>
-  </scm>
 </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.

[Openutils-svn] SF.net SVN: openutils: [355] tags

From: <fg...@us...> - 2007-07-10 15:15:25

Revision: 355
          http://svn.sourceforge.net/openutils/?rev=355&view=rev
Author:   fgiust
Date:     2007-07-10 08:15:27 -0700 (Tue, 10 Jul 2007)

Log Message:
-----------
[maven-release-plugin]  copy for tag openutils-testing-testng-1.1.2

Added Paths:
-----------
    tags/openutils-testing-testng-1.1.2/
    tags/openutils-testing-testng-1.1.2/pom.xml

Removed Paths:
-------------
    tags/openutils-testing-testng-1.1.2/pom.xml

Copied: tags/openutils-testing-testng-1.1.2 (from rev 353, trunk/openutils-testing-testng)

Deleted: tags/openutils-testing-testng-1.1.2/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml	2007-07-03 22:04:13 UTC (rev 353)
+++ tags/openutils-testing-testng-1.1.2/pom.xml	2007-07-10 15:15:27 UTC (rev 355)
@@ -1,59 +0,0 @@
-<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.sourceforge.openutils</groupId>
-		<artifactId>openutils</artifactId>
-		<version>3</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<artifactId>openutils-testing-testng</artifactId>
-	<name>openutils test utils (testng)</name>
-	<version>1.1.2-SNAPSHOT</version>
-	<description>openutils test utils</description>
-	<dependencies>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.2</version>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.13</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>2.0.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>2.0.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-hibernate3</artifactId>
-			<version>2.0.1</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>2.3</version>
-		</dependency>
-		<dependency>
-			<groupId>org.dbunit</groupId>
-			<artifactId>dbunit</artifactId>
-			<version>2.2</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.testng</groupId>
-			<artifactId>testng</artifactId>
-			<classifier>jdk15</classifier>
-			<version>5.1</version>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file

Copied: tags/openutils-testing-testng-1.1.2/pom.xml (from rev 354, trunk/openutils-testing-testng/pom.xml)
===================================================================
--- tags/openutils-testing-testng-1.1.2/pom.xml	                        (rev 0)
+++ tags/openutils-testing-testng-1.1.2/pom.xml	2007-07-10 15:15:27 UTC (rev 355)
@@ -0,0 +1,65 @@
+<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.sourceforge.openutils</groupId>
+		<artifactId>openutils</artifactId>
+		<version>3</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>openutils-testing-testng</artifactId>
+	<name>openutils test utils (testng)</name>
+	<version>1.1.2</version>
+	<description>openutils test utils</description>
+	<dependencies>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>1.2</version>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.13</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>2.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>2.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-hibernate3</artifactId>
+			<version>2.0.1</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.dbunit</groupId>
+			<artifactId>dbunit</artifactId>
+			<version>2.2</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.testng</groupId>
+			<artifactId>testng</artifactId>
+			<classifier>jdk15</classifier>
+			<version>5.1</version>
+		</dependency>
+	</dependencies>
+
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-testng-1.1.2</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-testng-1.1.2</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-testng-1.1.2</url>
+  </scm>
+</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.

[Openutils-svn] SF.net SVN: openutils: [354] trunk/openutils-testing-testng/pom.xml

From: <fg...@us...> - 2007-07-10 15:15:16

Revision: 354
          http://svn.sourceforge.net/openutils/?rev=354&view=rev
Author:   fgiust
Date:     2007-07-10 08:15:18 -0700 (Tue, 10 Jul 2007)

Log Message:
-----------
[maven-release-plugin] prepare release openutils-testing-testng-1.1.2

Modified Paths:
--------------
    trunk/openutils-testing-testng/pom.xml

Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml	2007-07-03 22:04:13 UTC (rev 353)
+++ trunk/openutils-testing-testng/pom.xml	2007-07-10 15:15:18 UTC (rev 354)
@@ -8,7 +8,7 @@
 	</parent>
 	<artifactId>openutils-testing-testng</artifactId>
 	<name>openutils test utils (testng)</name>
-	<version>1.1.2-SNAPSHOT</version>
+	<version>1.1.2</version>
 	<description>openutils test utils</description>
 	<dependencies>
 		<dependency>
@@ -56,4 +56,10 @@
 			<version>5.1</version>
 		</dependency>
 	</dependencies>
+
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-testng-1.1.2</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-testng-1.1.2</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-testng-1.1.2</url>
+  </scm>
 </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.

[Openutils-svn] SF.net SVN: openutils: [353] trunk/openutils-dbmigration/pom.xml

From: <fg...@us...> - 2007-07-03 22:04:11

Revision: 353
          http://svn.sourceforge.net/openutils/?rev=353&view=rev
Author:   fgiust
Date:     2007-07-03 15:04:13 -0700 (Tue, 03 Jul 2007)

Log Message:
-----------
[maven-release-plugin] prepare for next development iteration

Modified Paths:
--------------
    trunk/openutils-dbmigration/pom.xml

Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml	2007-07-03 22:04:07 UTC (rev 352)
+++ trunk/openutils-dbmigration/pom.xml	2007-07-03 22:04:13 UTC (rev 353)
@@ -8,7 +8,7 @@
   </parent>
   <artifactId>openutils-dbmigration</artifactId>
   <name>openutils db migration framework</name>
-  <version>0.7</version>
+  <version>0.8-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
@@ -84,10 +84,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.7</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.7</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-dbmigration-0.7</url>
-  </scm>
 </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.

[Openutils-svn] SF.net SVN: openutils: [352] tags

From: <fg...@us...> - 2007-07-03 22:04:06

Revision: 352
          http://svn.sourceforge.net/openutils/?rev=352&view=rev
Author:   fgiust
Date:     2007-07-03 15:04:07 -0700 (Tue, 03 Jul 2007)

Log Message:
-----------
[maven-release-plugin]  copy for tag openutils-dbmigration-0.7

Added Paths:
-----------
    tags/openutils-dbmigration-0.7/
    tags/openutils-dbmigration-0.7/pom.xml
    tags/openutils-dbmigration-0.7/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java

Removed Paths:
-------------
    tags/openutils-dbmigration-0.7/pom.xml
    tags/openutils-dbmigration-0.7/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java

Copied: tags/openutils-dbmigration-0.7 (from rev 342, trunk/openutils-dbmigration)

Deleted: tags/openutils-dbmigration-0.7/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml	2007-06-30 15:21:31 UTC (rev 342)
+++ tags/openutils-dbmigration-0.7/pom.xml	2007-07-03 22:04:07 UTC (rev 352)
@@ -1,87 +0,0 @@
-<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.sourceforge.openutils</groupId>
-    <artifactId>openutils</artifactId>
-    <version>3</version>
-    <relativePath>..</relativePath>
-  </parent>
-  <artifactId>openutils-dbmigration</artifactId>
-  <name>openutils db migration framework</name>
-  <version>0.7-SNAPSHOT</version>
-  <description />
-  <dependencies>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.3</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>1.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-jdbc</artifactId>
-      <version>2.0.1</version>
-      <exclusions>
-        <exclusion>
-          <groupId>avalon-framework</groupId>
-          <artifactId>avalon-framework</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>logkit</groupId>
-          <artifactId>logkit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-      <version>2.0.1</version>
-      <exclusions>
-        <exclusion>
-          <groupId>avalon-framework</groupId>
-          <artifactId>avalon-framework</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>logkit</groupId>
-          <artifactId>logkit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      <version>2.0.1</version>
-      <exclusions>
-        <exclusion>
-          <groupId>avalon-framework</groupId>
-          <artifactId>avalon-framework</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>logkit</groupId>
-          <artifactId>logkit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.2</version>
-    </dependency>
-    <dependency>
-      <groupId>poi</groupId>
-      <artifactId>poi</artifactId>
-      <version>2.5.1-final-20040804</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.0</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file

Copied: tags/openutils-dbmigration-0.7/pom.xml (from rev 351, trunk/openutils-dbmigration/pom.xml)
===================================================================
--- tags/openutils-dbmigration-0.7/pom.xml	                        (rev 0)
+++ tags/openutils-dbmigration-0.7/pom.xml	2007-07-03 22:04:07 UTC (rev 352)
@@ -0,0 +1,93 @@
+<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.sourceforge.openutils</groupId>
+    <artifactId>openutils</artifactId>
+    <version>3</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>openutils-dbmigration</artifactId>
+  <name>openutils db migration framework</name>
+  <version>0.7</version>
+  <description />
+  <dependencies>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.3</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>1.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>2.0.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>avalon-framework</groupId>
+          <artifactId>avalon-framework</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>logkit</groupId>
+          <artifactId>logkit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>2.0.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>avalon-framework</groupId>
+          <artifactId>avalon-framework</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>logkit</groupId>
+          <artifactId>logkit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>2.0.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>avalon-framework</groupId>
+          <artifactId>avalon-framework</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>logkit</groupId>
+          <artifactId>logkit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>poi</groupId>
+      <artifactId>poi</artifactId>
+      <version>2.5.1-final-20040804</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.0</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.7</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.7</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-dbmigration-0.7</url>
+  </scm>
+</project>
\ No newline at end of file

Deleted: tags/openutils-dbmigration-0.7/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java	2007-06-30 15:21:31 UTC (rev 342)
+++ tags/openutils-dbmigration-0.7/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java	2007-07-03 22:04:07 UTC (rev 352)
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
- */
-package it.openutils.migration.task.setup;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-
-import javax.sql.DataSource;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.io.Resource;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
-
-
-/**
- * @author fgiust
- * @version $Id$
- */
-public class GenericScriptBasedConditionalTask implements DbTask
-{
-
-    /**
-     * Logger.
-     */
-    private static Logger log = LoggerFactory.getLogger(GenericScriptBasedConditionalTask.class);
-
-    /**
-     * Script list to execute
-     */
-    protected List<Resource> scripts;
-
-    private String check;
-
-    /**
-     * Sets the scripts.
-     * @param scripts the scripts to set
-     */
-    public void setScripts(List<Resource> scripts)
-    {
-        this.scripts = scripts;
-    }
-
-    /**
-     * Sets the check.
-     * @param check the check to set
-     */
-    public void setCheck(String check)
-    {
-        this.check = check;
-    }
-
-    /**
-     * @param script The script resource
-     * @return The script name
-     */
-    protected String objectNameFromFileName(Resource script)
-    {
-        return StringUtils.substringBeforeLast(script.getFilename(), ".");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getDescription()
-    {
-        // @todo add better description and avoid NPEs
-        return "Checking " + objectNameFromFileName(scripts.get(0));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void execute(DataSource dataSource)
-    {
-
-        SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
-
-        for (Resource script : scripts)
-        {
-            int result = jdbcTemplate.queryForInt(check, this.objectNameFromFileName(script));
-            if (result == 0)
-            {
-                if (script == null || !script.exists())
-                {
-                    log.error("Unable to execute db task \"{}\", script \"{}\" not found.", getDescription(), script);
-                    return;
-                }
-
-                String scriptContent;
-                InputStream is = null;
-
-                try
-                {
-                    is = script.getInputStream();
-                    scriptContent = IOUtils.toString(is, "UTF8");
-                }
-                catch (IOException e)
-                {
-                    log.error(
-                        "Unable to execute db task \"{}\", script \"{}\" can't be read.",
-                        getDescription(),
-                        script);
-                    return;
-                }
-                finally
-                {
-                    IOUtils.closeQuietly(is);
-                }
-
-                String[] ddls = StringUtils.split(scriptContent, ";");
-
-                for (String ddl : ddls)
-                {
-                    if (StringUtils.isNotBlank(ddl))
-                    {
-                        log.debug("Executing:\n{}", ddl);
-                        jdbcTemplate.update(ddl);
-                    }
-                }
-            }
-        }
-
-    }
-}

Copied: tags/openutils-dbmigration-0.7/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java (from rev 350, trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java)
===================================================================
--- tags/openutils-dbmigration-0.7/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java	                        (rev 0)
+++ tags/openutils-dbmigration-0.7/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java	2007-07-03 22:04:07 UTC (rev 352)
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.migration.task.setup;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.io.Resource;
+import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class GenericScriptBasedConditionalTask implements DbTask
+{
+
+    /**
+     * Logger.
+     */
+    private static Logger log = LoggerFactory.getLogger(GenericScriptBasedConditionalTask.class);
+
+    /**
+     * Script list to execute
+     */
+    protected List<Resource> scripts;
+
+    private String check;
+
+    /**
+     * Sets the scripts.
+     * @param scripts the scripts to set
+     */
+    public void setScripts(List<Resource> scripts)
+    {
+        this.scripts = scripts;
+    }
+
+    /**
+     * Sets the check.
+     * @param check the check to set
+     */
+    public void setCheck(String check)
+    {
+        this.check = check;
+    }
+
+    /**
+     * @param script The script resource
+     * @return The script name
+     */
+    protected String objectNameFromFileName(Resource script)
+    {
+        return StringUtils.substringBeforeLast(script.getFilename(), ".");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String getDescription()
+    {
+        if (scripts == null)
+        {
+            return "Nothing to do, no scripts configured";
+        }
+
+        StringBuffer result = new StringBuffer();
+        if (!scripts.isEmpty())
+        {
+            result.append("Checking :\n");
+            for (Resource script : scripts)
+            {
+                result.append("  - " + objectNameFromFileName(script) + "\n");
+            }
+
+        }
+        return result.toString();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void execute(DataSource dataSource)
+    {
+
+        SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+
+        for (Resource script : scripts)
+        {
+            int result = jdbcTemplate.queryForInt(check, this.objectNameFromFileName(script));
+            if (result == 0)
+            {
+                if (script == null || !script.exists())
+                {
+                    log.error("Unable to execute db task \"{}\", script \"{}\" not found.", getDescription(), script);
+                    return;
+                }
+
+                String scriptContent;
+                InputStream is = null;
+
+                try
+                {
+                    is = script.getInputStream();
+                    scriptContent = IOUtils.toString(is, "UTF8");
+                }
+                catch (IOException e)
+                {
+                    log.error(
+                        "Unable to execute db task \"{}\", script \"{}\" can't be read.",
+                        getDescription(),
+                        script);
+                    return;
+                }
+                finally
+                {
+                    IOUtils.closeQuietly(is);
+                }
+
+                String[] ddls = StringUtils.split(scriptContent, ";");
+
+                for (String ddl : ddls)
+                {
+                    if (StringUtils.isNotBlank(ddl))
+                    {
+                        log.debug("Executing:\n{}", ddl);
+                        jdbcTemplate.update(ddl);
+                    }
+                }
+            }
+        }
+
+    }
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [351] trunk/openutils-dbmigration/pom.xml

From: <fg...@us...> - 2007-07-03 22:03:55

Revision: 351
          http://svn.sourceforge.net/openutils/?rev=351&view=rev
Author:   fgiust
Date:     2007-07-03 15:03:58 -0700 (Tue, 03 Jul 2007)

Log Message:
-----------
[maven-release-plugin] prepare release openutils-dbmigration-0.7

Modified Paths:
--------------
    trunk/openutils-dbmigration/pom.xml

Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml	2007-07-03 21:47:37 UTC (rev 350)
+++ trunk/openutils-dbmigration/pom.xml	2007-07-03 22:03:58 UTC (rev 351)
@@ -8,7 +8,7 @@
   </parent>
   <artifactId>openutils-dbmigration</artifactId>
   <name>openutils db migration framework</name>
-  <version>0.7-SNAPSHOT</version>
+  <version>0.7</version>
   <description />
   <dependencies>
     <dependency>
@@ -84,4 +84,10 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <scm>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.7</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.7</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-dbmigration-0.7</url>
+  </scm>
 </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.

[Openutils-svn] SF.net SVN: openutils: [350] trunk/openutils-dbmigration/src/main/java/it/ openutils/migration/task/setup/GenericScriptBasedConditionalTask.java

From: <fg...@us...> - 2007-07-03 21:47:34

Revision: 350
          http://svn.sourceforge.net/openutils/?rev=350&view=rev
Author:   fgiust
Date:     2007-07-03 14:47:37 -0700 (Tue, 03 Jul 2007)

Log Message:
-----------
fix getDescription()

Modified Paths:
--------------
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java	2007-07-03 07:58:42 UTC (rev 349)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java	2007-07-03 21:47:37 UTC (rev 350)
@@ -68,8 +68,22 @@
      */
     public String getDescription()
     {
-        // @todo add better description and avoid NPEs
-        return "Checking " + objectNameFromFileName(scripts.get(0));
+        if (scripts == null)
+        {
+            return "Nothing to do, no scripts configured";
+        }
+
+        StringBuffer result = new StringBuffer();
+        if (!scripts.isEmpty())
+        {
+            result.append("Checking :\n");
+            for (Resource script : scripts)
+            {
+                result.append("  - " + objectNameFromFileName(script) + "\n");
+            }
+
+        }
+        return result.toString();
     }
 
     /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [349] tags/openutils-mgnlspring-0.1/pom.xml

From: <fg...@us...> - 2007-07-03 07:58:39

Revision: 349
          http://svn.sourceforge.net/openutils/?rev=349&view=rev
Author:   fgiust
Date:     2007-07-03 00:58:42 -0700 (Tue, 03 Jul 2007)

Log Message:
-----------
fix groupId

Modified Paths:
--------------
    tags/openutils-mgnlspring-0.1/pom.xml

Modified: tags/openutils-mgnlspring-0.1/pom.xml
===================================================================
--- tags/openutils-mgnlspring-0.1/pom.xml	2007-07-03 07:56:49 UTC (rev 348)
+++ tags/openutils-mgnlspring-0.1/pom.xml	2007-07-03 07:58:42 UTC (rev 349)
@@ -8,7 +8,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-  <groupId>it.openmindonline.magnolia</groupId>
   <artifactId>openutils-mgnlspring</artifactId>
   <name>openutils-mgnlspring</name>
   <version>0.1</version>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [348] trunk/openutils-mgnlspring/pom.xml

From: <fg...@us...> - 2007-07-03 07:56:47

Revision: 348
          http://svn.sourceforge.net/openutils/?rev=348&view=rev
Author:   fgiust
Date:     2007-07-03 00:56:49 -0700 (Tue, 03 Jul 2007)

Log Message:
-----------
fix groupId

Modified Paths:
--------------
    trunk/openutils-mgnlspring/pom.xml

Modified: trunk/openutils-mgnlspring/pom.xml
===================================================================
--- trunk/openutils-mgnlspring/pom.xml	2007-06-30 15:33:12 UTC (rev 347)
+++ trunk/openutils-mgnlspring/pom.xml	2007-07-03 07:56:49 UTC (rev 348)
@@ -8,7 +8,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-  <groupId>it.openmindonline.magnolia</groupId>
   <artifactId>openutils-mgnlspring</artifactId>
   <name>openutils-mgnlspring</name>
   <version>0.2-SNAPSHOT</version>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [347] trunk/openutils-mgnlspring/pom.xml

From: <fg...@us...> - 2007-06-30 15:33:12

Revision: 347
          http://svn.sourceforge.net/openutils/?rev=347&view=rev
Author:   fgiust
Date:     2007-06-30 08:33:12 -0700 (Sat, 30 Jun 2007)

Log Message:
-----------
[maven-release-plugin] prepare for next development iteration

Modified Paths:
--------------
    trunk/openutils-mgnlspring/pom.xml

Modified: trunk/openutils-mgnlspring/pom.xml
===================================================================
--- trunk/openutils-mgnlspring/pom.xml	2007-06-30 15:33:03 UTC (rev 346)
+++ trunk/openutils-mgnlspring/pom.xml	2007-06-30 15:33:12 UTC (rev 347)
@@ -11,7 +11,7 @@
   <groupId>it.openmindonline.magnolia</groupId>
   <artifactId>openutils-mgnlspring</artifactId>
   <name>openutils-mgnlspring</name>
-  <version>0.1</version>
+  <version>0.2-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -79,10 +79,4 @@
       </exclusions>
     </dependency>
   </dependencies>
-
-  <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlspring-0.1</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlspring-0.1</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlspring-0.1</url>
-  </scm>
 </project>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [346] tags/openutils-mgnlspring-0.1/

From: <fg...@us...> - 2007-06-30 15:33:02

Revision: 346
          http://svn.sourceforge.net/openutils/?rev=346&view=rev
Author:   fgiust
Date:     2007-06-30 08:33:03 -0700 (Sat, 30 Jun 2007)

Log Message:
-----------
[maven-release-plugin]  copy for tag openutils-mgnlspring-0.1

Added Paths:
-----------
    tags/openutils-mgnlspring-0.1/

Copied: tags/openutils-mgnlspring-0.1 (from rev 345, trunk/openutils-mgnlspring)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Flat | Threaded

<< < 1 .. 215 216 217 218 219 .. 227 > >> (Page 217 of 227)