activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1064206 - in /activemq/activemq-apollo/trunk: apollo-broker/ apollo-broker/src/main/resources/ apollo-broker/src/main/resources/META-INF/services/org.apache.activemq.apollo/ apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/ja...
Date Thu, 27 Jan 2011 17:13:03 GMT
Author: chirino
Date: Thu Jan 27 17:13:03 2011
New Revision: 1064206

URL: http://svn.apache.org/viewvc?rev=1064206&view=rev
Log:
Some package cleanups.

Added:
    activemq/activemq-apollo/trunk/apollo-transport/src/main/resources/META-INF/services/org.apache.activemq.apollo/
    activemq/activemq-apollo/trunk/apollo-transport/src/main/resources/META-INF/services/org.apache.activemq.apollo/transport-factory.index
      - copied, changed from r1064205, activemq/activemq-apollo/trunk/apollo-transport/src/main/resources/META-INF/services/org.apache.activem.apollo/transport-factory.index
Removed:
    activemq/activemq-apollo/trunk/apollo-broker/src/main/resources/non-persistent-activemq.xml
    activemq/activemq-apollo/trunk/apollo-broker/src/main/resources/persistent-activemq.xml
    activemq/activemq-apollo/trunk/apollo-transport/src/main/resources/META-INF/services/org.apache.activem.apollo/transport-factory.index
Modified:
    activemq/activemq-apollo/trunk/apollo-broker/pom.xml
    activemq/activemq-apollo/trunk/apollo-broker/src/main/resources/META-INF/services/org.apache.activemq.apollo/broker-factory.index
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jaxb/XmlBrokerFactory.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/osgi/Activator.scala

Modified: activemq/activemq-apollo/trunk/apollo-broker/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/pom.xml?rev=1064206&r1=1064205&r2=1064206&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/pom.xml Thu Jan 27 17:13:03 2011
@@ -138,17 +138,28 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>${slf4j-version}</version>
       <scope>test</scope>
-      <version>${log4j-version}</version>
     </dependency>
-      
+
+
   </dependencies>
 
   <build>
     <plugins>
 
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Bundle-Activator>org.apache.activemq.apollo.osgi.ApolloActivator</Bundle-Activator>
+          </instructions>
+        </configuration>
+      </plugin>
+
       <!-- Generate a test jar for the test cases in this package -->
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/resources/META-INF/services/org.apache.activemq.apollo/broker-factory.index
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/resources/META-INF/services/org.apache.activemq.apollo/broker-factory.index?rev=1064206&r1=1064205&r2=1064206&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/resources/META-INF/services/org.apache.activemq.apollo/broker-factory.index
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/resources/META-INF/services/org.apache.activemq.apollo/broker-factory.index
Thu Jan 27 17:13:03 2011
@@ -14,4 +14,4 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
-org.apache.activemq.apollo.jaxb.XmlBrokerFactory
\ No newline at end of file
+org.apache.activemq.apollo.broker.jaxb.XmlBrokerFactory
\ No newline at end of file

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jaxb/XmlBrokerFactory.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jaxb/XmlBrokerFactory.scala?rev=1064206&r1=1064205&r2=1064206&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jaxb/XmlBrokerFactory.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jaxb/XmlBrokerFactory.scala
Thu Jan 27 17:13:03 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.activemq.apollo.jaxb
+package org.apache.activemq.apollo.broker.jaxb
 
 import java.io.IOException
 import java.net.{URL, URI}

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/osgi/Activator.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/osgi/Activator.scala?rev=1064206&r1=1064205&r2=1064206&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/osgi/Activator.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/osgi/Activator.scala
Thu Jan 27 17:13:03 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.osgi
+package org.apache.activemq.apollo.broker.osgi
 
 import java.util.concurrent.ConcurrentHashMap
 import org.osgi.framework._

Copied: activemq/activemq-apollo/trunk/apollo-transport/src/main/resources/META-INF/services/org.apache.activemq.apollo/transport-factory.index
(from r1064205, activemq/activemq-apollo/trunk/apollo-transport/src/main/resources/META-INF/services/org.apache.activem.apollo/transport-factory.index)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-transport/src/main/resources/META-INF/services/org.apache.activemq.apollo/transport-factory.index?p2=activemq/activemq-apollo/trunk/apollo-transport/src/main/resources/META-INF/services/org.apache.activemq.apollo/transport-factory.index&p1=activemq/activemq-apollo/trunk/apollo-transport/src/main/resources/META-INF/services/org.apache.activem.apollo/transport-factory.index&r1=1064205&r2=1064206&rev=1064206&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-transport/src/main/resources/META-INF/services/org.apache.activem.apollo/transport-factory.index
(original)
+++ activemq/activemq-apollo/trunk/apollo-transport/src/main/resources/META-INF/services/org.apache.activemq.apollo/transport-factory.index
Thu Jan 27 17:13:03 2011
@@ -14,4 +14,4 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
-org.apache.activemq.transport.pipe.PipeTransportFactory
+org.apache.activemq.apollo.transport.pipe.PipeTransportFactory



Mime
View raw message