servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r588165 - in /incubator/servicemix/branches/servicemix-4.0: camel/src/main/java/org/apache/servicemix/camel/ main/ main/src/main/java/org/apache/servicemix/main/ management/acegi/src/main/resources/META-INF/spring/ management/core/src/main/...
Date Thu, 25 Oct 2007 08:42:22 GMT
Author: gnodet
Date: Thu Oct 25 01:42:21 2007
New Revision: 588165

URL: http://svn.apache.org/viewvc?rev=588165&view=rev
Log:
Fix spring osgi schema location

Modified:
    incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java
    incubator/servicemix/branches/servicemix-4.0/main/pom.xml
    incubator/servicemix/branches/servicemix-4.0/main/src/main/java/org/apache/servicemix/main/Main.java
    incubator/servicemix/branches/servicemix-4.0/management/acegi/src/main/resources/META-INF/spring/servicemix-management-acegi.xml
    incubator/servicemix/branches/servicemix-4.0/management/core/src/main/resources/META-INF/spring/servicemix-management.xml
    incubator/servicemix/branches/servicemix-4.0/nmr/src/main/resources/META-INF/spring/servicemix-nmr.xml
    incubator/servicemix/branches/servicemix-4.0/transaction/src/main/resources/META-INF/spring/servicemix-tx.xml

Modified: incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java?rev=588165&r1=588164&r2=588165&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java
(original)
+++ incubator/servicemix/branches/servicemix-4.0/camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java
Thu Oct 25 01:42:21 2007
@@ -131,4 +131,12 @@
     public Exchange newInstance() {
         return null;  //To change body of implemented methods use File | Settings | File
Templates.
     }
+
+    public void setIn(Message message) {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setOut(Message message) {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
 }

Modified: incubator/servicemix/branches/servicemix-4.0/main/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/main/pom.xml?rev=588165&r1=588164&r2=588165&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/main/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/main/pom.xml Thu Oct 25 01:42:21 2007
@@ -49,6 +49,7 @@
         </exclusion-->
       </exclusions>
     </dependency>
+    <!--
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.bundlerepository</artifactId>
@@ -64,11 +65,7 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.apache.directory.daemon</groupId>
-      <artifactId>daemon-bootstrappers</artifactId>
-      <version>1.1.1</version>
-    </dependency>
+    -->
   </dependencies>
   <build>
     <plugins>

Modified: incubator/servicemix/branches/servicemix-4.0/main/src/main/java/org/apache/servicemix/main/Main.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/main/src/main/java/org/apache/servicemix/main/Main.java?rev=588165&r1=588164&r2=588165&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/main/src/main/java/org/apache/servicemix/main/Main.java
(original)
+++ incubator/servicemix/branches/servicemix-4.0/main/src/main/java/org/apache/servicemix/main/Main.java
Thu Oct 25 01:42:21 2007
@@ -160,8 +160,8 @@
         String profileDirName = configProps.getProperty(BundleCache.CACHE_PROFILE_DIR_PROP);
 
         // Print welcome banner.
-        System.out.println("\nWelcome to Felix.");
-        System.out.println("=================\n");
+        System.out.println("\nWelcome to ServiceMix.");
+        System.out.println("=====================\n");
 
         // If no profile or profile directory is specified in the
         // properties, then ask for a profile name.

Modified: incubator/servicemix/branches/servicemix-4.0/management/acegi/src/main/resources/META-INF/spring/servicemix-management-acegi.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/management/acegi/src/main/resources/META-INF/spring/servicemix-management-acegi.xml?rev=588165&r1=588164&r2=588165&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/management/acegi/src/main/resources/META-INF/spring/servicemix-management-acegi.xml
(original)
+++ incubator/servicemix/branches/servicemix-4.0/management/acegi/src/main/resources/META-INF/spring/servicemix-management-acegi.xml
Thu Oct 25 01:42:21 2007
@@ -28,7 +28,7 @@
   http://www.springframework.org/schema/util
   http://www.springframework.org/schema/util/spring-util.xsd
   http://www.springframework.org/schema/osgi
-  http://www.springframework.org/schema/osgi/spring-osgi-1.0-m3.xsd
+  http://www.springframework.org/schema/osgi/spring-osgi.xsd
   http://www.springframework.org/schema/osgi-compendium
   http://www.springframework.org/schema/osgi/spring-osgi-compendium.xsd">
 

Modified: incubator/servicemix/branches/servicemix-4.0/management/core/src/main/resources/META-INF/spring/servicemix-management.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/management/core/src/main/resources/META-INF/spring/servicemix-management.xml?rev=588165&r1=588164&r2=588165&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/management/core/src/main/resources/META-INF/spring/servicemix-management.xml
(original)
+++ incubator/servicemix/branches/servicemix-4.0/management/core/src/main/resources/META-INF/spring/servicemix-management.xml
Thu Oct 25 01:42:21 2007
@@ -28,7 +28,7 @@
   http://www.springframework.org/schema/util
   http://www.springframework.org/schema/util/spring-util.xsd
   http://www.springframework.org/schema/osgi
-  http://www.springframework.org/schema/osgi/spring-osgi-1.0-m3.xsd
+  http://www.springframework.org/schema/osgi/spring-osgi.xsd
   http://www.springframework.org/schema/osgi-compendium
   http://www.springframework.org/schema/osgi/spring-osgi-compendium.xsd">
 

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/src/main/resources/META-INF/spring/servicemix-nmr.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/src/main/resources/META-INF/spring/servicemix-nmr.xml?rev=588165&r1=588164&r2=588165&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/src/main/resources/META-INF/spring/servicemix-nmr.xml
(original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/src/main/resources/META-INF/spring/servicemix-nmr.xml
Thu Oct 25 01:42:21 2007
@@ -27,7 +27,7 @@
   http://www.springframework.org/schema/util
   http://www.springframework.org/schema/util/spring-util.xsd
   http://www.springframework.org/schema/osgi
-  http://www.springframework.org/schema/osgi/spring-osgi-1.0-m3.xsd">
+  http://www.springframework.org/schema/osgi/spring-osgi.xsd">
 
     <!-- ServiceMix NMR -->
     <bean id="servicemix" class="org.apache.servicemix.core.ServiceMix">

Modified: incubator/servicemix/branches/servicemix-4.0/transaction/src/main/resources/META-INF/spring/servicemix-tx.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/transaction/src/main/resources/META-INF/spring/servicemix-tx.xml?rev=588165&r1=588164&r2=588165&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/transaction/src/main/resources/META-INF/spring/servicemix-tx.xml
(original)
+++ incubator/servicemix/branches/servicemix-4.0/transaction/src/main/resources/META-INF/spring/servicemix-tx.xml
Thu Oct 25 01:42:21 2007
@@ -28,7 +28,7 @@
   http://www.springframework.org/schema/util
   http://www.springframework.org/schema/util/spring-util.xsd
   http://www.springframework.org/schema/osgi
-  http://www.springframework.org/schema/osgi/spring-osgi-1.0-m3.xsd
+  http://www.springframework.org/schema/osgi/spring-osgi.xsd
   http://www.springframework.org/schema/osgi-compendium
   http://www.springframework.org/schema/osgi/spring-osgi-compendium.xsd">
 



Mime
View raw message