activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r921357 - in /activemq/branches/activemq-5.3: activemq-camel/pom.xml activemq-camel/src/main/java/org/apache/camel/web/resources/ assembly/src/main/descriptors/common-bin.xml
Date Wed, 10 Mar 2010 14:12:58 GMT
Author: dejanb
Date: Wed Mar 10 14:12:57 2010
New Revision: 921357

URL: http://svn.apache.org/viewvc?rev=921357&view=rev
Log:
merge -c 921354 - https://issues.apache.org/activemq/browse/AMQ-2393 - camel 2.0.0 fix is
not needed anymore after upgrade to 2.2.0

Removed:
    activemq/branches/activemq-5.3/activemq-camel/src/main/java/org/apache/camel/web/resources/
Modified:
    activemq/branches/activemq-5.3/activemq-camel/pom.xml
    activemq/branches/activemq-5.3/assembly/src/main/descriptors/common-bin.xml

Modified: activemq/branches/activemq-5.3/activemq-camel/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-camel/pom.xml?rev=921357&r1=921356&r2=921357&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-camel/pom.xml (original)
+++ activemq/branches/activemq-5.3/activemq-camel/pom.xml Wed Mar 10 14:12:57 2010
@@ -54,23 +54,6 @@
     </activemq.osgi.export>
   </properties>
 
-  <repositories>
-    <repository>
-      <id>java.net.m2</id>
-      <name>java.net Maven 2 Repo</name>
-      <url>http://download.java.net/maven/2</url>
-    </repository>
-  </repositories>
-
-  <pluginRepositories>
-    <pluginRepository>
-      <id>java.net.m2</id>
-      <name>java.net Maven 2 Repo</name>
-      <url>http://download.java.net/maven/2</url>
-    </pluginRepository>
-  </pluginRepositories>
-
-
   <dependencies>
 
     <!-- =============================== -->
@@ -85,12 +68,6 @@
       <artifactId>camel-jms</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-web</artifactId>
-      <classifier>classes</classifier>
-      <version>${camel-version}</version>
-    </dependency>
-    <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>

Modified: activemq/branches/activemq-5.3/assembly/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/main/descriptors/common-bin.xml?rev=921357&r1=921356&r2=921357&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/branches/activemq-5.3/assembly/src/main/descriptors/common-bin.xml Wed Mar 10
14:12:57 2010
@@ -79,14 +79,6 @@
         <include>**/*.class</include>
       </includes>
     </fileSet>
-    <!-- add our patched RoutesResource class to mask 2.0.0 camel-web bug --> 
-     <fileSet>
-      <directory>../activemq-camel/target/classes</directory>
-      <outputDirectory>/webapps/camel/WEB-INF/classes</outputDirectory>
-      <includes>
-        <include>org/apache/camel/web/resources/RoutesResource.class</include>
-      </includes>
-    </fileSet>
   </fileSets> 
   
   <dependencySets>
@@ -107,8 +99,6 @@
       <unpackOptions>
         <excludes>
           <exclude>**/applicationContext.xml</exclude>
-          <!-- ignore RoutesResource class to mask 2.0.0 camel-web bug -->
-          <exclude>**/RoutesResource.class</exclude>
           <!-- ignore jars already in distro -->
           <exclude>**/act*.jar</exclude>
           <exclude>**/ant*.jar</exclude>



Mime
View raw message