You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2009/09/10 16:30:19 UTC

svn commit: r813457 - in /tuscany/java/sca/modules/host-jms: ./ META-INF/ META-INF/MANIFEST.MF pom.xml src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListenerDetails.java

Author: antelder
Date: Thu Sep 10 14:30:19 2009
New Revision: 813457

URL: http://svn.apache.org/viewvc?rev=813457&view=rev
Log:
Merge 1.x JMS host to 2.x

Added:
    tuscany/java/sca/modules/host-jms/   (props changed)
      - copied from r813455, tuscany/branches/sca-java-1.x/modules/host-jms/
    tuscany/java/sca/modules/host-jms/META-INF/
    tuscany/java/sca/modules/host-jms/META-INF/MANIFEST.MF
Modified:
    tuscany/java/sca/modules/host-jms/pom.xml
    tuscany/java/sca/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListenerDetails.java

Propchange: tuscany/java/sca/modules/host-jms/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Sep 10 14:30:19 2009
@@ -0,0 +1,21 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+pom.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders

Propchange: tuscany/java/sca/modules/host-jms/
------------------------------------------------------------------------------
    svn:mergeinfo = /tuscany/branches/sca-java-1.3/modules/host-jms:671193

Added: tuscany/java/sca/modules/host-jms/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-jms/META-INF/MANIFEST.MF?rev=813457&view=auto
==============================================================================
--- tuscany/java/sca/modules/host-jms/META-INF/MANIFEST.MF (added)
+++ tuscany/java/sca/modules/host-jms/META-INF/MANIFEST.MF Thu Sep 10 14:30:19 2009
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Private-Package: apache.tuscany.sca.host.jms;version="2.0.0"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA JMS Host
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 2.0.0
+Bnd-LastModified: 1225397237968
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA JMS Host
+Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.binding.jms;version="2.0.0",
+ org.apache.tuscany.sca.host.jms;version="2.0.0",
+ org.apache.tuscany.sca.invocation;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0"
+Bundle-SymbolicName: org.apache.tuscany.sca.host.jms
+Bundle-DocURL: http://www.apache.org/
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
+Export-Package: org.apache.tuscany.sca.host.jms;version="2.0.0"

Modified: tuscany/java/sca/modules/host-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-jms/pom.xml?rev=813457&r1=813455&r2=813457&view=diff
==============================================================================
--- tuscany/java/sca/modules/host-jms/pom.xml (original)
+++ tuscany/java/sca/modules/host-jms/pom.xml Thu Sep 10 14:30:19 2009
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-host-jms</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -55,23 +55,4 @@
         </dependency>         
     </dependencies>
 
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>${tuscany.version}</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.host.http</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.host.http*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

Modified: tuscany/java/sca/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListenerDetails.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListenerDetails.java?rev=813457&r1=813455&r2=813457&view=diff
==============================================================================
--- tuscany/java/sca/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListenerDetails.java (original)
+++ tuscany/java/sca/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListenerDetails.java Thu Sep 10 14:30:19 2009
@@ -20,7 +20,7 @@
 package org.apache.tuscany.sca.host.jms;
 
 import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
+import org.apache.tuscany.sca.binding.jms.JMSBinding;
 import org.apache.tuscany.sca.invocation.MessageFactory;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
 import org.apache.tuscany.sca.runtime.RuntimeComponentService;