logo       
<prev   next>

[picocontainer-scm] [picocontainer] [3130] java/nanocontainer/trunk: make b: msg#00032

java.picocontainer.cvs

Subject: [picocontainer-scm] [picocontainer] [3130] java/nanocontainer/trunk: make build more windows friendly

Diff

Modified: java/nanocontainer/trunk/NanoContainer.iml (3129 => 3130)

--- java/nanocontainer/trunk/NanoContainer.iml	2006-12-19 15:10:29 UTC (rev 3129)
+++ java/nanocontainer/trunk/NanoContainer.iml	2006-12-19 16:11:09 UTC (rev 3130)
@@ -47,7 +47,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="" />
+          <root url="" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -56,7 +56,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="" />
+          <root url="" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -65,7 +65,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="" />
+          <root url="" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -74,7 +74,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="" />
+          <root url="" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -83,7 +83,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="" />
+          <root url="" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -92,7 +92,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="" />
+          <root url="" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -101,7 +101,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="" />
+          <root url="" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -110,7 +110,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="" />
+          <root url="" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -119,7 +119,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="" />
+          <root url="" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -128,7 +128,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="" />
+          <root url="" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -137,7 +137,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="" />
+          <root url="" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -146,7 +146,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="" />
+          <root url="" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -155,7 +155,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="" />
+          <root url="" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -164,7 +164,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="" />
+          <root url="" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -173,7 +173,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="" />
+          <root url="" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -182,7 +182,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="" />
+          <root url="" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -191,7 +191,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="" />
+          <root url="" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

Modified: java/nanocontainer/trunk/container/src/test/org/nanocontainer/script/jruby/JRubyContainerBuilderTestCase.java (3129 => 3130)

--- java/nanocontainer/trunk/container/src/test/org/nanocontainer/script/jruby/JRubyContainerBuilderTestCase.java	2006-12-19 15:10:29 UTC (rev 3129)
+++ java/nanocontainer/trunk/container/src/test/org/nanocontainer/script/jruby/JRubyContainerBuilderTestCase.java	2006-12-19 16:11:09 UTC (rev 3130)
@@ -530,7 +530,7 @@
         } catch(PicoCompositionException e) {
             String message = e.getCause().getMessage();
             assertNotNull(message);
-            assertTrue(message.contains("undefined method `grant' for #<Nano::Container:"));
+            assertTrue(message.indexOf("undefined method `grant' for #<Nano::Container:") != -1);
         }
 
     }

Modified: java/nanocontainer/trunk/webcontainer/src/test/org/nanocontainer/webcontainer/DependencyInjectionServletWarFileTestCase.java (3129 => 3130)

--- java/nanocontainer/trunk/webcontainer/src/test/org/nanocontainer/webcontainer/DependencyInjectionServletWarFileTestCase.java	2006-12-19 15:10:29 UTC (rev 3129)
+++ java/nanocontainer/trunk/webcontainer/src/test/org/nanocontainer/webcontainer/DependencyInjectionServletWarFileTestCase.java	2006-12-19 16:11:09 UTC (rev 3130)
@@ -32,7 +32,7 @@
         parentContainer.registerComponentInstance(Integer.class, new Integer(5));
 
         server = new PicoJettyServer("localhost", 8080, parentContainer);
-        WebAppContext wac = server.addWebApplication("/bar", testWar.getAbsolutePath());
+        WebAppContext wac = server.addWebApplication("/bar", testWar.getAbsolutePath().replace('\\','/'));
         assertNotNull(wac);
 
         server.start();
@@ -57,7 +57,7 @@
         parentContainer.registerComponentInstance(Integer.class, new Integer(5));
 
         server = new PicoJettyServer("localhost", 8080, parentContainer);
-        WebAppContext wac = server.addWebApplication("/bar", testWar.getAbsolutePath());
+        WebAppContext wac = server.addWebApplication("/bar", testWar.getAbsolutePath().replace('\\','/'));
         assertNotNull(wac);
 
         server.start();

Modified: java/nanocontainer/trunk/webcontainer/src/test/org/nanocontainer/webcontainer/DependencyInjectionTestServlet.java (3129 => 3130)

--- java/nanocontainer/trunk/webcontainer/src/test/org/nanocontainer/webcontainer/DependencyInjectionTestServlet.java	2006-12-19 15:10:29 UTC (rev 3129)
+++ java/nanocontainer/trunk/webcontainer/src/test/org/nanocontainer/webcontainer/DependencyInjectionTestServlet.java	2006-12-19 16:11:09 UTC (rev 3130)
@@ -8,7 +8,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-
 public class DependencyInjectionTestServlet extends HttpServlet {
     private final String name;
     private String foo;

Modified: java/nanocontainer/trunk/webcontainer/src/test/org/nanocontainer/webcontainer/groovy/WebContainerBuilderTestCase.java (3129 => 3130)

--- java/nanocontainer/trunk/webcontainer/src/test/org/nanocontainer/webcontainer/groovy/WebContainerBuilderTestCase.java	2006-12-19 15:10:29 UTC (rev 3129)
+++ java/nanocontainer/trunk/webcontainer/src/test/org/nanocontainer/webcontainer/groovy/WebContainerBuilderTestCase.java	2006-12-19 16:11:09 UTC (rev 3130)
@@ -132,7 +132,7 @@
                 // declare the web container
                 "    webContainer() {\n" +
                 "        blockingChannelConnector(host:'localhost', port:8080)\n" +
-                "        xmlWebApplication(path:'/bar', warfile:'"+testWar.getAbsolutePath()+"')" +
+                "        xmlWebApplication(path:'/bar', warfile:'"+testWar.getAbsolutePath().replace('\\','/')+"')" +
                 "    }\n" +
                 // end declaration
                 "}\n");

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

<Prev in Thread] Current Thread [Next in Thread>
Previous by Date:  [picocontainer-scm] [picocontainer] [3128] java/nanocontainer-nanowar/trunk/examples/nanowar-struts-webapp: Added target to svn:ignore, mauro-yCVjj/EcxBJg9hUCZPvPmw
Next by Date:  [picocontainer-scm] [jira] Commented: (NANO-183) WebContainerBuilderTestCase Test Failures on Windows Machine, Paul Hammant (JIRA)
Previous by Thread:  [picocontainer-scm] [picocontainer] [3128] java/nanocontainer-nanowar/trunk/examples/nanowar-struts-webapp: Added target to svn:ignore, mauro-yCVjj/EcxBJg9hUCZPvPmw
Next by Thread:  [picocontainer-scm] [jira] Commented: (NANO-183) WebContainerBuilderTestCase Test Failures on Windows Machine, Paul Hammant (JIRA)
Indexes:  [Date] [Thread] [Top] [All Lists]

Google Custom Search
News | FAQ | advertise