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 2011/06/10 15:57:41 UTC
svn commit: r1134327 - in /activemq/activemq-apollo/trunk: ./
apollo-openwire/src/main/resouces/ apollo-openwire/src/main/resouces/org/
apollo-openwire/src/main/resouces/org/apache/
apollo-openwire/src/main/resouces/org/apache/activemq/ apollo-openwire...
Author: chirino
Date: Fri Jun 10 13:57:41 2011
New Revision: 1134327
URL: http://svn.apache.org/viewvc?rev=1134327&view=rev
Log:
Fixes https://issues.apache.org/jira/browse/APLO-43 : Generate an XSD to validate the apollo xml config file.
Added:
activemq/activemq-apollo/trunk/apollo-openwire/src/main/resouces/
activemq/activemq-apollo/trunk/apollo-openwire/src/main/resouces/org/
activemq/activemq-apollo/trunk/apollo-openwire/src/main/resouces/org/apache/
activemq/activemq-apollo/trunk/apollo-openwire/src/main/resouces/org/apache/activemq/
activemq/activemq-apollo/trunk/apollo-openwire/src/main/resouces/org/apache/activemq/apollo/
activemq/activemq-apollo/trunk/apollo-openwire/src/main/resouces/org/apache/activemq/apollo/openwire/
activemq/activemq-apollo/trunk/apollo-openwire/src/main/resouces/org/apache/activemq/apollo/openwire/dto/
activemq/activemq-apollo/trunk/apollo-openwire/src/main/resouces/org/apache/activemq/apollo/openwire/dto/jaxb.index
activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/dto/package-info.java
Modified:
activemq/activemq-apollo/trunk/apollo-website/pom.xml
activemq/activemq-apollo/trunk/pom.xml
Added: activemq/activemq-apollo/trunk/apollo-openwire/src/main/resouces/org/apache/activemq/apollo/openwire/dto/jaxb.index
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/resouces/org/apache/activemq/apollo/openwire/dto/jaxb.index?rev=1134327&view=auto
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-openwire/src/main/resouces/org/apache/activemq/apollo/openwire/dto/jaxb.index (added)
+++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/resouces/org/apache/activemq/apollo/openwire/dto/jaxb.index Fri Jun 10 13:57:41 2011
@@ -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.
+# ------------------------------------------------------------------------
+OpenwireConnectionStatusDTO
\ No newline at end of file
Added: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/dto/package-info.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/dto/package-info.java?rev=1134327&view=auto
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/dto/package-info.java (added)
+++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/dto/package-info.java Fri Jun 10 13:57:41 2011
@@ -0,0 +1,27 @@
+/**
+ * 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.openwire.dto;
+
Modified: activemq/activemq-apollo/trunk/apollo-website/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/pom.xml?rev=1134327&r1=1134326&r2=1134327&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-website/pom.xml Fri Jun 10 13:57:41 2011
@@ -63,6 +63,17 @@
<version>${slf4j-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>${jackson-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson-version}</version>
+ </dependency>
+
<!-- testing -->
<dependency>
<groupId>org.fusesource.scalate</groupId>
@@ -161,6 +172,60 @@
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>com.sun.tools.jxc.maven2</groupId>
+ <artifactId>maven-jaxb-schemagen-plugin</artifactId>
+ <version>1.3-dev</version>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-api-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+
+ <executions>
+ <execution>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <destdir>${basedir}/target/sitegen/documentation/schema</destdir>
+ <srcdir>${basedir}/..</srcdir>
+ <includes>
+ <include>**/package-info.java</include>
+ <include>**/*DTO.java</include>
+ </includes>
+ <excludes>
+ <exclude>apollo-hawtdb/**</exclude>
+ <exclude>apollo-cassandra/**</exclude>
+ <exclude>apollo-openwire/**</exclude>
+ <exclude>**/.git/**</exclude>
+ <exclude>**/.svn/**</exclude>
+ </excludes>
+ <schemas>
+ <schema>
+ <namespace>http://activemq.apache.org/schema/activemq/apollo</namespace>
+ <file>apollo.xsd</file>
+ </schema>
+ </schemas>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1134327&r1=1134326&r2=1134327&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Fri Jun 10 13:57:41 2011
@@ -793,6 +793,13 @@
<pluginRepositories>
<pluginRepository>
+ <id>com.fusesource.m2</id>
+ <url>http://repo.fusesource.com/nexus/content/groups/public/</url>
+ <releases><enabled>true</enabled></releases>
+ <snapshots><enabled>false</enabled></snapshots>
+ </pluginRepository>
+
+ <pluginRepository>
<id>apache-snapshots</id>
<url>https://repository.apache.org/content/repositories/snapshots</url>
<snapshots><enabled>true</enabled></snapshots>