activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r785289 - in /activemq/sandbox/activemq-flow/activemq-broker/src: main/java/org/apache/activemq/apollo/jaxb/ main/resources/ test/java/org/apache/activemq/apollo/jaxb/ test/resources/org/apache/activemq/apollo/jaxb/
Date Tue, 16 Jun 2009 16:47:34 GMT
Author: chirino
Date: Tue Jun 16 16:47:34 2009
New Revision: 785289

URL: http://svn.apache.org/viewvc?rev=785289&view=rev
Log:
Settting up the namespace.


Added:
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/jaxb/package-info.java
Modified:
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/jaxb/StoreXml.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/resources/non-persistent-activemq.xml
    activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/apollo/jaxb/JAXBConfigTest.java
    activemq/sandbox/activemq-flow/activemq-broker/src/test/resources/org/apache/activemq/apollo/jaxb/testSimpleConfig.xml

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/jaxb/StoreXml.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/jaxb/StoreXml.java?rev=785289&r1=785288&r2=785289&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/jaxb/StoreXml.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/jaxb/StoreXml.java
Tue Jun 16 16:47:34 2009
@@ -1,11 +1,10 @@
 package org.apache.activemq.apollo.jaxb;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
 
 import org.apache.activemq.broker.store.Store;
 
+@XmlSeeAlso( {MemoryStoreXml.class, KahaDBStoreXml.class} )
 public interface StoreXml {
 
 	Store createStore();

Added: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/jaxb/package-info.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/jaxb/package-info.java?rev=785289&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/jaxb/package-info.java
(added)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/jaxb/package-info.java
Tue Jun 16 16:47:34 2009
@@ -0,0 +1,25 @@
+/**
+ * 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.
+ */
+
+/**
+ * The JAXB POJOs for the
+ * <a href="http://activemq.apache.org/schema/activemq/apollo/xml-configuration.html">XML
Configuration</a>
+ * of the ActiveMQ Broker.
+ */
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://activemq.apache.org/schema/activemq/apollo",
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.apache.activemq.apollo.jaxb;
+

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/resources/non-persistent-activemq.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/resources/non-persistent-activemq.xml?rev=785289&r1=785288&r2=785289&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/resources/non-persistent-activemq.xml
(original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/resources/non-persistent-activemq.xml
Tue Jun 16 16:47:34 2009
@@ -15,7 +15,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<broker>
+<broker xmlns="http://activemq.apache.org/schema/activemq/apollo">
   <dispatcher name="test dispatcher" threads="4"/>
 
   <virtual-host>

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/apollo/jaxb/JAXBConfigTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/apollo/jaxb/JAXBConfigTest.java?rev=785289&r1=785288&r2=785289&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/apollo/jaxb/JAXBConfigTest.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/apollo/jaxb/JAXBConfigTest.java
Tue Jun 16 16:47:34 2009
@@ -50,6 +50,9 @@
 		assertEquals(expected, broker.getConnectUris());
 		
 		assertEquals(2, broker.getVirtualHosts().size());
+		
+		// assertNotNull(broker.getDefaultVirtualHost().getDatabase());
+		
 	}
 
     protected Broker createBroker() throws Exception {

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/test/resources/org/apache/activemq/apollo/jaxb/testSimpleConfig.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/test/resources/org/apache/activemq/apollo/jaxb/testSimpleConfig.xml?rev=785289&r1=785288&r2=785289&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/test/resources/org/apache/activemq/apollo/jaxb/testSimpleConfig.xml
(original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/test/resources/org/apache/activemq/apollo/jaxb/testSimpleConfig.xml
Tue Jun 16 16:47:34 2009
@@ -15,7 +15,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<broker>
+<broker xmlns="http://activemq.apache.org/schema/activemq/apollo">
   <dispatcher name="test dispatcher" threads="4"/>
 
   <transport-server>pipe://test1?wireFormat=mock</transport-server>



Mime
View raw message