You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2009/05/30 13:12:27 UTC
svn commit: r780235 - in /activemq/sandbox/activemq-flow: ./ activemq-broker/
activemq-broker/src/main/java/org/apache/activemq/broker/openwire/
activemq-broker/src/main/java/org/apache/activemq/broker/store/
activemq-broker/src/test/java/org/apache/ac...
Author: chirino
Date: Sat May 30 11:12:26 2009
New Revision: 780235
URL: http://svn.apache.org/viewvc?rev=780235&view=rev
Log:
Moved the resource files..
Added:
activemq/sandbox/activemq-flow/activemq-kaha/src/main/resources/META-INF/
activemq/sandbox/activemq-flow/activemq-kaha/src/main/resources/META-INF/services/
activemq/sandbox/activemq-flow/activemq-kaha/src/main/resources/META-INF/services/org/
activemq/sandbox/activemq-flow/activemq-kaha/src/main/resources/META-INF/services/org/apache/
activemq/sandbox/activemq-flow/activemq-kaha/src/main/resources/META-INF/services/org/apache/activemq/
activemq/sandbox/activemq-flow/activemq-kaha/src/main/resources/META-INF/services/org/apache/activemq/broker/
activemq/sandbox/activemq-flow/activemq-kaha/src/main/resources/META-INF/services/org/apache/activemq/broker/store/
activemq/sandbox/activemq-flow/activemq-kaha/src/main/resources/META-INF/services/org/apache/activemq/broker/store/kaha-db
activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/
activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/
activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/
activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/
activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/
- copied from r780227, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/openwire/
activemq/sandbox/activemq-flow/activemq-openwire/src/main/resources/META-INF/
activemq/sandbox/activemq-flow/activemq-openwire/src/main/resources/META-INF/services/
activemq/sandbox/activemq-flow/activemq-openwire/src/main/resources/META-INF/services/org/
activemq/sandbox/activemq-flow/activemq-openwire/src/main/resources/META-INF/services/org/apache/
activemq/sandbox/activemq-flow/activemq-openwire/src/main/resources/META-INF/services/org/apache/activemq/
activemq/sandbox/activemq-flow/activemq-openwire/src/main/resources/META-INF/services/org/apache/activemq/broker/
activemq/sandbox/activemq-flow/activemq-openwire/src/main/resources/META-INF/services/org/apache/activemq/broker/protocol/
activemq/sandbox/activemq-flow/activemq-openwire/src/main/resources/META-INF/services/org/apache/activemq/broker/protocol/openwire
activemq/sandbox/activemq-flow/activemq-openwire/src/main/resources/META-INF/services/org/apache/activemq/wireformat/
activemq/sandbox/activemq-flow/activemq-openwire/src/main/resources/META-INF/services/org/apache/activemq/wireformat/default
activemq/sandbox/activemq-flow/activemq-openwire/src/main/resources/META-INF/services/org/apache/activemq/wireformat/openwire
activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/
activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/
activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/
activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/broker/
activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/broker/SharedQueuePerfTest.java
- copied unchanged from r780227, activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueuePerfTest.java
activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/broker/openwire/
- copied from r780227, activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/openwire/
activemq/sandbox/activemq-flow/activemq-stomp/src/main/resources/META-INF/
activemq/sandbox/activemq-flow/activemq-stomp/src/main/resources/META-INF/services/
activemq/sandbox/activemq-flow/activemq-stomp/src/main/resources/META-INF/services/org/
activemq/sandbox/activemq-flow/activemq-stomp/src/main/resources/META-INF/services/org/apache/
activemq/sandbox/activemq-flow/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/
activemq/sandbox/activemq-flow/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/broker/
activemq/sandbox/activemq-flow/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/broker/protocol/
activemq/sandbox/activemq-flow/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/broker/protocol/stomp
activemq/sandbox/activemq-flow/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/wireformat/
activemq/sandbox/activemq-flow/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/wireformat/stomp
activemq/sandbox/activemq-flow/activemq-store/src/main/resources/META-INF/
activemq/sandbox/activemq-flow/activemq-store/src/main/resources/META-INF/services/
activemq/sandbox/activemq-flow/activemq-store/src/main/resources/META-INF/services/org/
activemq/sandbox/activemq-flow/activemq-store/src/main/resources/META-INF/services/org/apache/
activemq/sandbox/activemq-flow/activemq-store/src/main/resources/META-INF/services/org/apache/activemq/
activemq/sandbox/activemq-flow/activemq-store/src/main/resources/META-INF/services/org/apache/activemq/broker/
activemq/sandbox/activemq-flow/activemq-store/src/main/resources/META-INF/services/org/apache/activemq/broker/store/
activemq/sandbox/activemq-flow/activemq-store/src/main/resources/META-INF/services/org/apache/activemq/broker/store/memory
Removed:
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/openwire/
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/store/
activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueuePerfTest.java
activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/openwire/
activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/store/
activemq/sandbox/activemq-flow/activemq-protocol/
Modified:
activemq/sandbox/activemq-flow/activemq-broker/pom.xml
activemq/sandbox/activemq-flow/activemq-openwire/pom.xml
activemq/sandbox/activemq-flow/activemq-stomp/pom.xml
activemq/sandbox/activemq-flow/pom.xml
Modified: activemq/sandbox/activemq-flow/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/pom.xml?rev=780235&r1=780234&r2=780235&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/pom.xml (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/pom.xml Sat May 30 11:12:26 2009
@@ -47,10 +47,6 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-protocol</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
<artifactId>activemq-transport</artifactId>
</dependency>
<dependency>
Added: activemq/sandbox/activemq-flow/activemq-kaha/src/main/resources/META-INF/services/org/apache/activemq/broker/store/kaha-db
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-kaha/src/main/resources/META-INF/services/org/apache/activemq/broker/store/kaha-db?rev=780235&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-kaha/src/main/resources/META-INF/services/org/apache/activemq/broker/store/kaha-db (added)
+++ activemq/sandbox/activemq-flow/activemq-kaha/src/main/resources/META-INF/services/org/apache/activemq/broker/store/kaha-db Sat May 30 11:12:26 2009
@@ -0,0 +1,17 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+class=org.apache.activemq.broker.store.kahadb.KahaDBStore
\ No newline at end of file
Modified: activemq/sandbox/activemq-flow/activemq-openwire/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/pom.xml?rev=780235&r1=780234&r2=780235&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/pom.xml (original)
+++ activemq/sandbox/activemq-flow/activemq-openwire/pom.xml Sat May 30 11:12:26 2009
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-protocol</artifactId>
+ <artifactId>activemq-broker</artifactId>
</dependency>
<!-- Testing Dependencies -->
Added: activemq/sandbox/activemq-flow/activemq-openwire/src/main/resources/META-INF/services/org/apache/activemq/broker/protocol/openwire
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/src/main/resources/META-INF/services/org/apache/activemq/broker/protocol/openwire?rev=780235&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/src/main/resources/META-INF/services/org/apache/activemq/broker/protocol/openwire (added)
+++ activemq/sandbox/activemq-flow/activemq-openwire/src/main/resources/META-INF/services/org/apache/activemq/broker/protocol/openwire Sat May 30 11:12:26 2009
@@ -0,0 +1,17 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+class=org.apache.activemq.broker.openwire.OpenwireProtocolHandler
Added: activemq/sandbox/activemq-flow/activemq-openwire/src/main/resources/META-INF/services/org/apache/activemq/wireformat/default
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/src/main/resources/META-INF/services/org/apache/activemq/wireformat/default?rev=780235&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/src/main/resources/META-INF/services/org/apache/activemq/wireformat/default (added)
+++ activemq/sandbox/activemq-flow/activemq-openwire/src/main/resources/META-INF/services/org/apache/activemq/wireformat/default Sat May 30 11:12:26 2009
@@ -0,0 +1,17 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+class=org.apache.activemq.wireformat.DiscriminatableOpenWireFormatFactory
Added: activemq/sandbox/activemq-flow/activemq-openwire/src/main/resources/META-INF/services/org/apache/activemq/wireformat/openwire
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/src/main/resources/META-INF/services/org/apache/activemq/wireformat/openwire?rev=780235&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/src/main/resources/META-INF/services/org/apache/activemq/wireformat/openwire (added)
+++ activemq/sandbox/activemq-flow/activemq-openwire/src/main/resources/META-INF/services/org/apache/activemq/wireformat/openwire Sat May 30 11:12:26 2009
@@ -0,0 +1,17 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+class=org.apache.activemq.wireformat.DiscriminatableOpenWireFormatFactory
Modified: activemq/sandbox/activemq-flow/activemq-stomp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-stomp/pom.xml?rev=780235&r1=780234&r2=780235&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-stomp/pom.xml (original)
+++ activemq/sandbox/activemq-flow/activemq-stomp/pom.xml Sat May 30 11:12:26 2009
@@ -33,16 +33,9 @@
<dependencies>
- <!-- TODO: remove this dependency -->
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.3-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-protocol</artifactId>
+ <artifactId>activemq-broker</artifactId>
</dependency>
<dependency>
Added: activemq/sandbox/activemq-flow/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/broker/protocol/stomp
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/broker/protocol/stomp?rev=780235&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/broker/protocol/stomp (added)
+++ activemq/sandbox/activemq-flow/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/broker/protocol/stomp Sat May 30 11:12:26 2009
@@ -0,0 +1,17 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+class=org.apache.activemq.broker.stomp.StompProtocolHandler
\ No newline at end of file
Added: activemq/sandbox/activemq-flow/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/wireformat/stomp
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/wireformat/stomp?rev=780235&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/wireformat/stomp (added)
+++ activemq/sandbox/activemq-flow/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/wireformat/stomp Sat May 30 11:12:26 2009
@@ -0,0 +1,17 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+class=org.apache.activemq.wireformat.DiscriminatableStompWireFormatFactory
\ No newline at end of file
Added: activemq/sandbox/activemq-flow/activemq-store/src/main/resources/META-INF/services/org/apache/activemq/broker/store/memory
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-store/src/main/resources/META-INF/services/org/apache/activemq/broker/store/memory?rev=780235&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-store/src/main/resources/META-INF/services/org/apache/activemq/broker/store/memory (added)
+++ activemq/sandbox/activemq-flow/activemq-store/src/main/resources/META-INF/services/org/apache/activemq/broker/store/memory Sat May 30 11:12:26 2009
@@ -0,0 +1,17 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+class=org.apache.activemq.broker.store.memory.MemoryStore
\ No newline at end of file
Modified: activemq/sandbox/activemq-flow/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/pom.xml?rev=780235&r1=780234&r2=780235&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/pom.xml (original)
+++ activemq/sandbox/activemq-flow/pom.xml Sat May 30 11:12:26 2009
@@ -115,7 +115,6 @@
<module>activemq-flow</module>
<module>activemq-kaha</module>
<module>activemq-openwire</module>
- <module>activemq-protocol</module>
<module>activemq-stomp</module>
<module>activemq-store</module>
<module>activemq-transport</module>
@@ -197,11 +196,6 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-protocol</artifactId>
- <version>${activemq-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
<artifactId>activemq-stomp</artifactId>
<version>${activemq-version}</version>
</dependency>