You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2008/04/03 05:59:30 UTC

svn commit: r644153 - in /incubator/tuscany/branches/sca-java-1.2: distribution/manifest/pom.xml distribution/pom.xml samples/helloworld-reference-jms/pom.xml samples/helloworld-service-jms/pom.xml

Author: lresende
Date: Wed Apr  2 20:59:29 2008
New Revision: 644153

URL: http://svn.apache.org/viewvc?rev=644153&view=rev
Log:
Removing extra servlet-api jar from distribution

Modified:
    incubator/tuscany/branches/sca-java-1.2/distribution/manifest/pom.xml
    incubator/tuscany/branches/sca-java-1.2/distribution/pom.xml
    incubator/tuscany/branches/sca-java-1.2/samples/helloworld-reference-jms/pom.xml
    incubator/tuscany/branches/sca-java-1.2/samples/helloworld-service-jms/pom.xml

Modified: incubator/tuscany/branches/sca-java-1.2/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/distribution/manifest/pom.xml?rev=644153&r1=644152&r2=644153&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/distribution/manifest/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/distribution/manifest/pom.xml Wed Apr  2 20:59:29 2008
@@ -114,6 +114,10 @@
                     <groupId>org.apache.activemq</groupId>
                     <artifactId>activemq-jaas</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>servlet-api-2.5</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>  
         <dependency>

Modified: incubator/tuscany/branches/sca-java-1.2/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/distribution/pom.xml?rev=644153&r1=644152&r2=644153&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/distribution/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/distribution/pom.xml Wed Apr  2 20:59:29 2008
@@ -149,6 +149,10 @@
                     <groupId>org.apache.activemq</groupId>
                     <artifactId>activemq-jaas</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>servlet-api-2.5</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>  
     </dependencies>

Modified: incubator/tuscany/branches/sca-java-1.2/samples/helloworld-reference-jms/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/samples/helloworld-reference-jms/pom.xml?rev=644153&r1=644152&r2=644153&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/samples/helloworld-reference-jms/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/samples/helloworld-reference-jms/pom.xml Wed Apr  2 20:59:29 2008
@@ -81,7 +81,41 @@
             <groupId>org.apache.activemq</groupId>
             <artifactId>apache-activemq</artifactId>
             <version>4.1.1</version>
-            <scope>test</scope>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-httpclient</groupId>
+                    <artifactId>commons-httpclient</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.activemq</groupId>
+                    <artifactId>activemq-console</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.activemq</groupId>
+                    <artifactId>activemq-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.activemq</groupId>
+                    <artifactId>activemq-optional</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.activemq</groupId>
+                    <artifactId>activemq-web</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.activemq</groupId>
+                    <artifactId>activemq-web-demo</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.activemq</groupId>
+                    <artifactId>activemq-jaas</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>servlet-api-2.5</artifactId>
+                </exclusion>
+            </exclusions>			
         </dependency>     
         
     </dependencies>

Modified: incubator/tuscany/branches/sca-java-1.2/samples/helloworld-service-jms/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/samples/helloworld-service-jms/pom.xml?rev=644153&r1=644152&r2=644153&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/samples/helloworld-service-jms/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/samples/helloworld-service-jms/pom.xml Wed Apr  2 20:59:29 2008
@@ -38,7 +38,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
+            <artifactId>tuscany-sca-api</artifactId>
             <version>1.2-incubating-SNAPSHOT</version>
             <scope>compile</scope>            
         </dependency>
@@ -76,6 +76,40 @@
             <artifactId>apache-activemq</artifactId>
             <version>4.1.1</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-httpclient</groupId>
+                    <artifactId>commons-httpclient</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.activemq</groupId>
+                    <artifactId>activemq-console</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.activemq</groupId>
+                    <artifactId>activemq-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.activemq</groupId>
+                    <artifactId>activemq-optional</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.activemq</groupId>
+                    <artifactId>activemq-web</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.activemq</groupId>
+                    <artifactId>activemq-web-demo</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.activemq</groupId>
+                    <artifactId>activemq-jaas</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>servlet-api-2.5</artifactId>
+                </exclusion>
+            </exclusions>			
         </dependency>
 		
         <dependency>



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org