Author: jstrachan
Date: Tue Aug 1 03:59:22 2006
New Revision: 427527
URL: http://svn.apache.org/viewvc?rev=427527&view=rev
Log:
got the xbean XSDs to deploy as part of a release
Modified:
incubator/activemq/trunk/activemq-core/pom.xml
incubator/activemq/trunk/activemq-ra/pom.xml
Modified: incubator/activemq/trunk/activemq-core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/pom.xml?rev=427527&r1=427526&r2=427527&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/pom.xml (original)
+++ incubator/activemq/trunk/activemq-core/pom.xml Tue Aug 1 03:59:22 2006
@@ -303,15 +303,9 @@
<version>${pom.version}</version>
<configuration>
<scripts>
- GenerateJavaMarshalling.groovy:
- GenerateJavaTests.groovy:
- GenerateCSharpMarshalling.groovy:
- GenerateCSharpClasses.groovy:
- GenerateCppMarshallingClasses.groovy:
- GenerateCppMarshallingHeaders.groovy:
- GenerateCppHeaders.groovy:
- GenerateCppClasses.groovy:
- GenerateCMarshalling.groovy:
+ GenerateJavaMarshalling.groovy: GenerateJavaTests.groovy:
GenerateCSharpMarshalling.groovy:
+ GenerateCSharpClasses.groovy:
GenerateCppMarshallingClasses.groovy: GenerateCppMarshallingHeaders.groovy:
+ GenerateCppHeaders.groovy: GenerateCppClasses.groovy:
GenerateCMarshalling.groovy:
</scripts>
<groovyProperties>
<version>1</version>
@@ -327,6 +321,25 @@
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <version>2.0</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <configuration>
+ <sourceDirectory>${basedir}/src/main/grammar</sourceDirectory>
+
<outputDirectory>${basedir}/target/generated-javacc</outputDirectory>
+ <packageName>org.apache.activemq.selector</packageName>
+ </configuration>
+ <goals>
+ <goal>javacc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.xbean</groupId>
<artifactId>maven-xbean-plugin</artifactId>
<version>2.5</version>
@@ -343,25 +356,32 @@
</executions>
</plugin>
+ <!-- lets ensure that the XSD gets deployed -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>2.0</version>
+ <artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
- <phase>generate-sources</phase>
- <configuration>
- <sourceDirectory>${basedir}/src/main/grammar</sourceDirectory>
-
<outputDirectory>${basedir}/target/generated-javacc</outputDirectory>
- <packageName>org.apache.activemq.selector</packageName>
- </configuration>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
<goals>
- <goal>javacc</goal>
+ <goal>attach-artifact</goal>
</goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${basedir}/target/activemq.xsd</file>
+ <type>xsd</type>
+ </artifact>
+ <artifact>
+ <file>${basedir}/target/activemq.xsd.html</file>
+ <type>xsd.html</type>
+ </artifact>
+ </artifacts>
+ </configuration>
</execution>
</executions>
</plugin>
-
</plugins>
</build>
Modified: incubator/activemq/trunk/activemq-ra/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-ra/pom.xml?rev=427527&r1=427526&r2=427527&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-ra/pom.xml (original)
+++ incubator/activemq/trunk/activemq-ra/pom.xml Tue Aug 1 03:59:22 2006
@@ -1,27 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- 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.
+ 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.
-->
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://maven.apache.org/POM/4.0.0";>
-
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";>
+
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -35,13 +33,13 @@
<description>A JCA Resource Adapter used to integrate ActiveMQ with
transactional enterprise containers</description>
<dependencies>
-
+
<!-- activemq -->
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
@@ -69,7 +67,7 @@
<artifactId>cglib-full</artifactId>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -77,8 +75,6 @@
</dependency>
</dependencies>
-
- <!-- Configure which tests are included/excuded -->
<build>
<plugins>
<plugin>
@@ -96,6 +92,34 @@
</executions>
</plugin>
+ <!-- lets ensure that the XSD gets deployed -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${basedir}/target/xbean/activemq-ra.xsd</file>
+ <type>xsd</type>
+ </artifact>
+ <artifact>
+ <file>${basedir}/target/xbean/activemq-ra.xsd.html</file>
+ <type>xsd.html</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Configure which tests are included/excuded -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -105,7 +129,7 @@
<includes>
<include>org.apache.activemq.ra.ServerSessionImplTest</include>
<!--
- <include>**/*Test.*</include>
+ <include>**/*Test.*</include>
-->
</includes>
</configuration>
