You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by vi...@apache.org on 2006/10/19 16:14:37 UTC
svn commit: r465640 - in /incubator/qpid/branches/maven: ./ broker/
broker/src/main/ broker/src/main/java/ broker/src/main/java/org/
broker/src/org/ client/src/main/ client/src/main/java/
client/src/main/java/org/ client/src/org/ common/ common/src/mai...
Author: vinoski
Date: Thu Oct 19 07:14:36 2006
New Revision: 465640
URL: http://svn.apache.org/viewvc?view=rev&rev=465640
Log:
more maven branch modifications
Added:
incubator/qpid/branches/maven/broker/src/main/
incubator/qpid/branches/maven/broker/src/main/java/
incubator/qpid/branches/maven/broker/src/main/java/org/
- copied from r465131, incubator/qpid/branches/maven/broker/src/org/
incubator/qpid/branches/maven/client/src/main/
incubator/qpid/branches/maven/client/src/main/java/
incubator/qpid/branches/maven/client/src/main/java/org/
- copied from r465131, incubator/qpid/branches/maven/client/src/org/
incubator/qpid/branches/maven/common/protocol-version.xml
- copied, changed from r465131, incubator/qpid/branches/maven/common/build-module.xml
incubator/qpid/branches/maven/common/src/main/versions/ProtocolVersionList.java_in
- copied unchanged from r465137, incubator/qpid/branches/maven/common/src/main/resources/ProtocolVersionList.java
incubator/qpid/branches/maven/management/cli/src/main/
incubator/qpid/branches/maven/management/cli/src/main/java/
incubator/qpid/branches/maven/management/cli/src/main/java/org/
- copied from r465131, incubator/qpid/branches/maven/management/cli/src/org/
incubator/qpid/branches/maven/management/core/src/main/
incubator/qpid/branches/maven/management/core/src/main/java/
incubator/qpid/branches/maven/management/core/src/main/java/org/
- copied from r465131, incubator/qpid/branches/maven/management/core/src/org/
incubator/qpid/branches/maven/management/core/src/main/schema/
- copied from r465131, incubator/qpid/branches/maven/management/core/etc/
Removed:
incubator/qpid/branches/maven/broker/src/org/
incubator/qpid/branches/maven/client/src/org/
incubator/qpid/branches/maven/common/build-module.xml
incubator/qpid/branches/maven/common/build-old.xml
incubator/qpid/branches/maven/common/spec-xslt.xml
incubator/qpid/branches/maven/common/src/main/resources/ProtocolVersionList.java
incubator/qpid/branches/maven/management/cli/src/org/
incubator/qpid/branches/maven/management/core/etc/
incubator/qpid/branches/maven/management/core/src/org/
Modified:
incubator/qpid/branches/maven/broker/pom.xml
incubator/qpid/branches/maven/common/pom.xml
incubator/qpid/branches/maven/management/cli/pom.xml
incubator/qpid/branches/maven/management/core/pom.xml
incubator/qpid/branches/maven/management/pom.xml
incubator/qpid/branches/maven/pom.xml
Modified: incubator/qpid/branches/maven/broker/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/maven/broker/pom.xml?view=diff&rev=465640&r1=465639&r2=465640
==============================================================================
--- incubator/qpid/branches/maven/broker/pom.xml (original)
+++ incubator/qpid/branches/maven/broker/pom.xml Thu Oct 19 07:14:36 2006
@@ -50,6 +50,14 @@
<artifactId>mina-filter-ssl</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.directory.mina</groupId>
+ <artifactId>mina-java5</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-common</artifactId>
</dependency>
Modified: incubator/qpid/branches/maven/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/maven/common/pom.xml?view=diff&rev=465640&r1=465639&r2=465640
==============================================================================
--- incubator/qpid/branches/maven/common/pom.xml (original)
+++ incubator/qpid/branches/maven/common/pom.xml Thu Oct 19 07:14:36 2006
@@ -42,7 +42,7 @@
<generated.path>${project.build.directory}/generated/xsl</generated.path>
<generated.package>org/apache/qpid/framing</generated.package>
<generated.dir>${generated.path}/${generated.package}</generated.dir>
- <amqp.xml>${topDirectoryLocation}/../../trunk/qpid/specs/amqp-8.0.xml</amqp.xml>
+ <specs.dir>${topDirectoryLocation}/../../trunk/qpid/specs</specs.dir>
</properties>
<build>
@@ -65,17 +65,18 @@
</dependencies>
<executions>
<execution>
- <id>spec-stylesheet</id>
+ <id>protocol-version</id>
<phase>generate-sources</phase>
<configuration>
<tasks>
- <ant antfile="spec-xslt.xml">
+ <ant antfile="protocol-version.xml">
<property name="cluster.asl" value="${cluster.asl}"/>
<property name="spec.stylesheet" value="${spec.stylesheet}"/>
<property name="registry.stylesheet" value="${registry.stylesheet}"/>
<property name="registry.template" value="${registry.template}"/>
<property name="generated.dir" value="${generated.dir}"/>
- <property name="amqp.xml" value="${amqp.xml}"/>
+ <property name="proto_version" value="${generated.dir}/ProtocolVersionList.java"/>
+ <property name="specs.dir" value="${specs.dir}"/>
</ant>
</tasks>
<sourceRoot>${generated.path}</sourceRoot>
Copied: incubator/qpid/branches/maven/common/protocol-version.xml (from r465131, incubator/qpid/branches/maven/common/build-module.xml)
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/maven/common/protocol-version.xml?view=diff&rev=465640&p1=incubator/qpid/branches/maven/common/build-module.xml&r1=465131&p2=incubator/qpid/branches/maven/common/protocol-version.xml&r2=465640
==============================================================================
--- incubator/qpid/branches/maven/common/build-module.xml (original)
+++ incubator/qpid/branches/maven/common/protocol-version.xml Thu Oct 19 07:14:36 2006
@@ -15,18 +15,9 @@
- limitations under the License.
-
-->
-<project name="AMQ Common" default="build">
+<project name="Qpid Common Protocol Versions" default="generate">
- <import file="../module.xml"/>
-
- <property name="cluster.asl" value="resources/cluster.asl"/>
- <property name="stylesheet" value="stylesheets/framing.xsl"/>
- <property name="registry_stylesheet" value="stylesheets/registry.xsl"/>
- <property name="registry_template" value="resources/registry.template"/>
<property name="saxon.jar" value="lib/saxon/saxon8.jar"/>
- <property name="generated.package" value="org/apache/qpid/framing"/>
- <property name="generated.dir" value="${module.precompiled}/${generated.package}"/>
- <property name="proto_version" value="${generated.dir}/ProtocolVersionList.java"/>
<macrodef name="saxon">
<attribute name="out"/>
@@ -48,15 +39,15 @@
<attribute name="ver"/>
<sequential>
<!-- Check for the existence of the AMQP specification file -->
- <property name="amqpspecfile-@{ver}" value="${project.root}/../specs/amqp-@{ver}.xml"/>
- <available file="${project.root}/../specs/amqp-@{ver}.xml"
+ <property name="amqpspecfile-@{ver}" value="${specs.dir}/amqp-@{ver}.xml"/>
+ <available file="${specs.dir}/amqp-@{ver}.xml"
property="amqpspecfile.present-@{ver}"/>
<fail unless="amqpspecfile.present-@{ver}"
- message="ERROR: AMQP specification file ${project.root}/../specs/amqp-@{ver}.xml not found."/>
+ message="ERROR: AMQP specification file ${specs.dir}/amqp-@{ver}.xml not found."/>
<!-- Read in the file as a set of properties; extract the amqp version -->
- <xmlproperty prefix="@{ver}" file="${project.root}/../specs/amqp-@{ver}.xml"/>
- <echo>Found AMQP specification file "${project.root}/../specs/amqp-@{ver}.xml"; major=${@{ver}.amqp(major)} minor=${@{ver}.amqp(minor)}</echo>
+ <xmlproperty prefix="@{ver}" file="${specs.dir}/amqp-@{ver}.xml"/>
+ <echo>Found AMQP specification file "${specs.dir}/amqp-@{ver}.xml"; major=${@{ver}.amqp(major)} minor=${@{ver}.amqp(minor)}</echo>
<!-- Add the version to the ProtocolVersionList.java file -->
<replaceregexp file="${proto_version}" match=" // !VER!"
@@ -69,8 +60,8 @@
<!-- Create directory; generate from specification file -->
<mkdir dir="${generated.dir}_${@{ver}.amqp(major)}_${@{ver}.amqp(minor)}"/>
<saxon out="${generated.dir}_${@{ver}.amqp(major)}_${@{ver}.amqp(minor)}/results.out"
- src="${project.root}/../specs/amqp-@{ver}.xml"
- xsl="${stylesheet}">
+ src="${specs.dir}/amqp-@{ver}.xml"
+ xsl="${spec.stylesheet}">
<arg value="major=${@{ver}.amqp(major)}"/>
<arg value="minor=${@{ver}.amqp(minor)}"/>
<arg value="registry_name=MainRegistry"/>
@@ -78,14 +69,14 @@
<!-- -->
<saxon out="${generated.dir}_${@{ver}.amqp(major)}_${@{ver}.amqp(minor)}/cluster.out"
src="${cluster.asl}"
- xsl="${stylesheet}">
+ xsl="${spec.stylesheet}">
<arg value="major=${@{ver}.amqp(major)}"/>
<arg value="minor=${@{ver}.amqp(minor)}"/>
<arg value="registry_name=ClusterRegistry"/>
</saxon>
<saxon out="${generated.dir}_${@{ver}.amqp(major)}_${@{ver}.amqp(minor)}/registry.out"
- src="${registry_template}"
- xsl="${registry_stylesheet}">
+ src="${registry.template}"
+ xsl="${registry.stylesheet}">
<arg value="major=${@{ver}.amqp(major)}"/>
<arg value="minor=${@{ver}.amqp(minor)}"/>
</saxon>
@@ -98,7 +89,7 @@
<!-- <target name="generate" unless="generated"> -->
<target name="generate">
<mkdir dir="${generated.dir}"/>
- <copy file="resources/ProtocolVersionList.java" tofile="${proto_version}"
+ <copy file="src/main/versions/ProtocolVersionList.java_in" tofile="${proto_version}"
overwrite="true"/>
<!--
NOTE: Set the AMQP version numbers to be supported in this build here.
Modified: incubator/qpid/branches/maven/management/cli/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/maven/management/cli/pom.xml?view=diff&rev=465640&r1=465639&r2=465640
==============================================================================
--- incubator/qpid/branches/maven/management/cli/pom.xml (original)
+++ incubator/qpid/branches/maven/management/cli/pom.xml Thu Oct 19 07:14:36 2006
@@ -42,5 +42,13 @@
<groupId>jython</groupId>
<artifactId>jython</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-mgmt-core</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/qpid/branches/maven/management/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/maven/management/core/pom.xml?view=diff&rev=465640&r1=465639&r2=465640
==============================================================================
--- incubator/qpid/branches/maven/management/core/pom.xml (original)
+++ incubator/qpid/branches/maven/management/core/pom.xml Thu Oct 19 07:14:36 2006
@@ -101,10 +101,6 @@
<artifactId>xml-resolver</artifactId>
</dependency>
<dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon</artifactId>
- </dependency>
- <dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId>
</dependency>
@@ -129,8 +125,9 @@
<properties>
<topDirectoryLocation>../..</topDirectoryLocation>
<src.main.schema>src/main/schema</src.main.schema>
- <generated.path>${project.build.directory}/generated/xmlbeans</generated.path>
- <xmlbeans.timestamp>${generated.path}/xmlbeans.timestamp</xmlbeans.timestamp>
+ <generated.path.src>${project.build.directory}/generated/xmlbeans</generated.path.src>
+ <generated.path.classes>${project.build.directory}/classes</generated.path.classes>
+ <xmlbeans.timestamp>${generated.path.src}/xmlbeans.timestamp</xmlbeans.timestamp>
</properties>
<build>
@@ -141,25 +138,35 @@
<version>${antrun.version}</version>
<dependencies>
<dependency>
- <groupId>ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.6.5</version>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>2.0.0</version>
</dependency>
<dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6.5</version>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean_xpath</artifactId>
+ <version>2.1.0</version>
</dependency>
<dependency>
<groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>2.0.0</version>
+ <artifactId>xmlpublic</artifactId>
+ <version>2.1.0</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jsr173_api</artifactId>
<version>1.0</version>
</dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.6.5</version>
+ </dependency>
</dependencies>
<executions>
<execution>
@@ -167,13 +174,15 @@
<phase>generate-sources</phase>
<configuration>
<tasks>
- <ant antfile="xmlbeans-gen.xml">
- <property name="xmlbeans.timestamp" value="${xmlbeans.timestamp}"/>
- <property name="generated.path" value="${generated.path}"/>
- <property name="src.main.schema" value="${src.main.schema}"/>
- </ant>
+ <taskdef name="xmlbean"
+ classname="org.apache.xmlbeans.impl.tool.XMLBean"/>
+ <xmlbean classgendir="${generated.path.classes}" srconly="true"
+ failonerror="true" srcgendir="${generated.path.src}"
+ javasource="1.5" source="1.5">
+ <fileset dir="${src.main.schema}" includes="**/*.xsd"/>
+ </xmlbean>
</tasks>
- <sourceRoot>${generated.path}</sourceRoot>
+ <sourceRoot>${generated.path.src}</sourceRoot>
</configuration>
<goals>
<goal>run</goal>
Modified: incubator/qpid/branches/maven/management/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/maven/management/pom.xml?view=diff&rev=465640&r1=465639&r2=465640
==============================================================================
--- incubator/qpid/branches/maven/management/pom.xml (original)
+++ incubator/qpid/branches/maven/management/pom.xml Thu Oct 19 07:14:36 2006
@@ -45,4 +45,23 @@
<module>cli</module>
</modules>
+ <dependencies>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean_xpath</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xmlpublic</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ </dependency>
+ </dependencies>
+
</project>
Modified: incubator/qpid/branches/maven/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/maven/pom.xml?view=diff&rev=465640&r1=465639&r2=465640
==============================================================================
--- incubator/qpid/branches/maven/pom.xml (original)
+++ incubator/qpid/branches/maven/pom.xml Thu Oct 19 07:14:36 2006
@@ -374,6 +374,16 @@
<version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.apache.directory.mina</groupId>
+ <artifactId>mina-java5</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>