You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/04/20 23:37:27 UTC

svn commit: r395704 - in /incubator/servicemix/trunk: ./ licenses/ servicemix-assembly/src/main/release/ servicemix-bpe/src/test/java/org/apache/servicemix/bpe/ servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/

Author: gnodet
Date: Thu Apr 20 14:37:25 2006
New Revision: 395704

URL: http://svn.apache.org/viewcvs?rev=395704&view=rev
Log:
Add placeholder for all licenses and a NOTICE file

Added:
    incubator/servicemix/trunk/LICENSE
      - copied unchanged from r393972, incubator/servicemix/trunk/LICENSE.txt
    incubator/servicemix/trunk/NOTICE
    incubator/servicemix/trunk/README
      - copied, changed from r393972, incubator/servicemix/trunk/README.txt
    incubator/servicemix/trunk/licenses/
    incubator/servicemix/trunk/servicemix-assembly/src/main/release/README
      - copied, changed from r394226, incubator/servicemix/trunk/servicemix-assembly/src/main/release/README.txt
Removed:
    incubator/servicemix/trunk/LICENSE.txt
    incubator/servicemix/trunk/README.txt
    incubator/servicemix/trunk/servicemix-assembly/src/main/release/README.txt
Modified:
    incubator/servicemix/trunk/servicemix-bpe/src/test/java/org/apache/servicemix/bpe/BPEComponentTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/InstallComponentTaskTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/JbiTaskSupport.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/JbiTaskTest.java

Added: incubator/servicemix/trunk/NOTICE
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/NOTICE?rev=395704&view=auto
==============================================================================
--- incubator/servicemix/trunk/NOTICE (added)
+++ incubator/servicemix/trunk/NOTICE Thu Apr 20 14:37:25 2006
@@ -0,0 +1,11 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Apache ServiceMix distribution.               ==
+   =========================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Please read the different LICENSE files present in the licenses directory of
+   this distribution.

Copied: incubator/servicemix/trunk/README (from r393972, incubator/servicemix/trunk/README.txt)
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/README?p2=incubator/servicemix/trunk/README&p1=incubator/servicemix/trunk/README.txt&r1=393972&r2=395704&rev=395704&view=diff
==============================================================================
--- incubator/servicemix/trunk/README.txt (original)
+++ incubator/servicemix/trunk/README Thu Apr 20 14:37:25 2006
@@ -1,21 +1,38 @@
-Welcome to ServiceMix
+Welcome to Apache ServiceMix!
+======================
+Apache ServiceMix is an open source distributed Enterprise Service Bus (ESB) and SOA toolkit built from the ground up 
+on the semantics and APIs of the Java Business Integration (JBI) specification JSR 208 and released under 
+the Apache 2.0 license.
+
+Apache ServiceMix is lightweight and easily embeddable, has integrated Spring support and can be run at the edge of 
+the network (inside a client or server), as a standalone ESB provider or as a service within another ESB. 
+You can use ServiceMix in Java SE or a Java EE application server.
+
+
+Incubation Disclaimer
 =====================
+Apache ServiceMix is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Geronimo PMC. 
+Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, 
+communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
+
+While incubation status is not necessarily a reflection of the completeness or stability of the code, it does 
+indicate that the project has yet to be fully endorsed by the ASF.
+
 
-This project makes use of the Maven tool...
+Getting Started
+===============
+To find out how to get started try this
+http://incubator.apache.org/servicemix/Getting+Started
 
-http://maven.apache.org/
+If you need more help try talking to us on our mailing lists
+http://incubator.apache.org/servicemix/Mailing+Lists
 
-to build itself. Please download maven 1.x,
-install it as per the instructions on Maven's site and then type
 
-  maven
+We welcome contributions
+http://incubator.apache.org/servicemix/Contributing
 
-Maven will download ServiceMix dependencies from global repositories.
-You may experience failures due to timeouts accessing these repositories.
-In such cases, retry until all dependencies have been sucessfully downloaded.
+Many thanks for using Apache ServiceMix.
 
-You may run into path name length limitation if you try to build ServiceMix
-under Windows using Cygwin.  In these cases, you should move the source 
-directory higher in the file system tree.
 
-Enjoy!
+The ServiceMix Team
+http://incubator.apache.org/servicemix/Team

Copied: incubator/servicemix/trunk/servicemix-assembly/src/main/release/README (from r394226, incubator/servicemix/trunk/servicemix-assembly/src/main/release/README.txt)
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/src/main/release/README?p2=incubator/servicemix/trunk/servicemix-assembly/src/main/release/README&p1=incubator/servicemix/trunk/servicemix-assembly/src/main/release/README.txt&r1=394226&r2=395704&rev=395704&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/src/main/release/README.txt (original)
+++ incubator/servicemix/trunk/servicemix-assembly/src/main/release/README Thu Apr 20 14:37:25 2006
@@ -1,17 +1,17 @@
-Welcome to ServiceMix!
+Welcome to Apache ServiceMix!
 ======================
-ServiceMix is an open source distributed Enterprise Service Bus (ESB) and SOA toolkit built from the ground up 
+Apache ServiceMix is an open source distributed Enterprise Service Bus (ESB) and SOA toolkit built from the ground up 
 on the semantics and APIs of the Java Business Integration (JBI) specification JSR 208 and released under 
 the Apache 2.0 license.
 
-ServiceMix is lightweight and easily embeddable, has integrated Spring support and can be run at the edge of 
+Apache ServiceMix is lightweight and easily embeddable, has integrated Spring support and can be run at the edge of 
 the network (inside a client or server), as a standalone ESB provider or as a service within another ESB. 
 You can use ServiceMix in Java SE or a Java EE application server.
 
 
 Incubation Disclaimer
 =====================
-ServiceMix is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Geronimo PMC. 
+Apache ServiceMix is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Geronimo PMC. 
 Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, 
 communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
 
@@ -22,17 +22,17 @@
 Getting Started
 ===============
 To find out how to get started try this
-http://servicemix.org/Getting+Started
+http://incubator.apache.org/servicemix/Getting+Started
 
 If you need more help try talking to us on our mailing lists
-http://servicemix.org/Mailing+Lists
+http://incubator.apache.org/servicemix/Mailing+Lists
 
 
 We welcome contributions
-http://servicemix.org/Contributing
+http://incubator.apache.org/servicemix/Contributing
 
-Many thanks for using ServiceMix.
+Many thanks for using Apache ServiceMix.
 
 
 The ServiceMix Team
-http://servicemix.org/Team
+http://incubator.apache.org/servicemix/Team

Modified: incubator/servicemix/trunk/servicemix-bpe/src/test/java/org/apache/servicemix/bpe/BPEComponentTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-bpe/src/test/java/org/apache/servicemix/bpe/BPEComponentTest.java?rev=395704&r1=395703&r2=395704&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-bpe/src/test/java/org/apache/servicemix/bpe/BPEComponentTest.java (original)
+++ incubator/servicemix/trunk/servicemix-bpe/src/test/java/org/apache/servicemix/bpe/BPEComponentTest.java Thu Apr 20 14:37:25 2006
@@ -207,6 +207,9 @@
         me.setOperation(new QName("getLoanQuote"));
         me.getMessage("in").setContent(new StringSource("<getLoanQuoteRequest xmlns=\"urn:logicblaze:soa:loanbroker\"><ssn>234341</ssn></getLoanQuoteRequest>"));
         client.sendSync(me);
+        if (me.getError() != null) {
+            throw me.getError();
+        }
         assertEquals(ExchangeStatus.ACTIVE, me.getStatus());
         assertNotNull(me.getFault());
         client.done(me);

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/InstallComponentTaskTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/InstallComponentTaskTest.java?rev=395704&r1=395703&r2=395704&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/InstallComponentTaskTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/InstallComponentTaskTest.java Thu Apr 20 14:37:25 2006
@@ -15,12 +15,12 @@
  */
 package org.apache.servicemix.jbi.management.task;
 
-import org.apache.servicemix.jbi.management.task.InstallComponentTask;
-import org.apache.servicemix.jbi.util.FileUtil;
-
 import java.io.File;
 import java.net.URL;
 
+import org.apache.servicemix.jbi.util.FileUtil;
+import org.apache.tools.ant.Project;
+
 /**
  *
  * InstallComponentTaskTest
@@ -34,9 +34,11 @@
      * @see TestCase#setUp()
      */
     protected void setUp() throws Exception {
+        FileUtil.deleteFile(rootDir);
         this.container.setRootDir(rootDir.getPath());
         super.setUp();        
         installComponentTask = new InstallComponentTask(){};
+        installComponentTask.setProject(new Project());
         installComponentTask.init();
     }
 
@@ -55,7 +57,7 @@
             installComponentTask.setFile(file);
             installComponentTask.init();
             installComponentTask.execute();
-            File testFile = new File(rootDir, container.getName() + File.separator + "components" + File.separator
+            File testFile = new File(rootDir, "components" + File.separator
                     + "ComponentTest");
             assertTrue(testFile.exists());
             FileUtil.deleteFile(rootDir);

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/JbiTaskSupport.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/JbiTaskSupport.java?rev=395704&r1=395703&r2=395704&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/JbiTaskSupport.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/JbiTaskSupport.java Thu Apr 20 14:37:25 2006
@@ -41,7 +41,7 @@
         
         // Need to sleep as the jmx remote connector 
         // is started in another thread
-        Thread.sleep(10000);
+        Thread.sleep(5000);
         
         remoteConnection = new JbiTask(){
             protected void doExecute(AdminCommandsServiceMBean acs) throws Exception {

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/JbiTaskTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/JbiTaskTest.java?rev=395704&r1=395703&r2=395704&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/JbiTaskTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/JbiTaskTest.java Thu Apr 20 14:37:25 2006
@@ -18,6 +18,7 @@
 import javax.jbi.management.DeploymentServiceMBean;
 
 import org.apache.servicemix.jbi.framework.AdminCommandsServiceMBean;
+import org.apache.tools.ant.Project;
 
 
 /**
@@ -38,6 +39,7 @@
             protected void doExecute(AdminCommandsServiceMBean acs) throws Exception {
             }
         };
+        jbiTask.setProject(new Project());
         jbiTask.init();
         jbiTask.connect();
     }