You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2006/11/24 00:18:19 UTC
svn commit: r478707 - in
/incubator/qpid/branches/new_persistence/java/common: pom.xml
resources/ProtocolVersionList.java src/main/resources/xsl/
src/main/versions/ src/main/versions/ProtocolVersionList.java src/org/
stylesheets/
Author: rgreig
Date: Thu Nov 23 15:18:16 2006
New Revision: 478707
URL: http://svn.apache.org/viewvc?view=rev&rev=478707
Log:
Start of merge from trunk - some manual restructuring
Added:
incubator/qpid/branches/new_persistence/java/common/pom.xml (with props)
incubator/qpid/branches/new_persistence/java/common/src/main/resources/xsl/
- copied from r477134, incubator/qpid/branches/new_persistence/java/common/stylesheets/
incubator/qpid/branches/new_persistence/java/common/src/main/versions/
incubator/qpid/branches/new_persistence/java/common/src/main/versions/ProtocolVersionList.java (with props)
Removed:
incubator/qpid/branches/new_persistence/java/common/resources/ProtocolVersionList.java
incubator/qpid/branches/new_persistence/java/common/src/org/
incubator/qpid/branches/new_persistence/java/common/stylesheets/
Added: incubator/qpid/branches/new_persistence/java/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/common/pom.xml?view=auto&rev=478707
==============================================================================
--- incubator/qpid/branches/new_persistence/java/common/pom.xml (added)
+++ incubator/qpid/branches/new_persistence/java/common/pom.xml Thu Nov 23 15:18:16 2006
@@ -0,0 +1,99 @@
+<!--
+ 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 xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-common</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-incubating-M2-SNAPSHOT</version>
+ <name>Qpid Common Utilities</name>
+ <url>http://cwiki.apache.org/confluence/display/qpid</url>
+
+ <parent>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid</artifactId>
+ <version>1.0-incubating-M2-SNAPSHOT</version>
+ </parent>
+
+ <properties>
+ <topDirectoryLocation>..</topDirectoryLocation>
+ <cluster.asl>${basedir}/src/main/xsl/cluster.asl</cluster.asl>
+ <spec.stylesheet>${basedir}/src/main/xsl/framing.xsl</spec.stylesheet>
+ <registry.stylesheet>${basedir}/src/main/xsl/registry.xsl</registry.stylesheet>
+ <registry.template>${basedir}/src/main/xsl/registry.template</registry.template>
+ <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>
+ <specs.dir>${topDirectoryLocation}/../specs</specs.dir>
+ </properties>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>protocol-version</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks>
+ <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="proto_version" value="${generated.dir}/ProtocolVersionList.java"/>
+ <property name="specs.dir" value="${specs.dir}"/>
+ </ant>
+ </tasks>
+ <sourceRoot>${generated.path}</sourceRoot>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Propchange: incubator/qpid/branches/new_persistence/java/common/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/qpid/branches/new_persistence/java/common/src/main/versions/ProtocolVersionList.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/common/src/main/versions/ProtocolVersionList.java?view=auto&rev=478707
==============================================================================
--- incubator/qpid/branches/new_persistence/java/common/src/main/versions/ProtocolVersionList.java (added)
+++ incubator/qpid/branches/new_persistence/java/common/src/main/versions/ProtocolVersionList.java Thu Nov 23 15:18:16 2006
@@ -0,0 +1,37 @@
+/**
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed 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.
+ *
+ */
+
+/**
+ * This class is autogenerated, do not modify.
+ */
+
+package org.apache.qpid.framing;
+
+/**
+ * NOTE: Don't remove the line containing the token VER or VER1 - these are
+ * markers for code generation.
+ */
+
+public interface ProtocolVersionList
+{
+ public final int PROTOCOL_MAJOR = 0;
+ public final int PROTOCOL_MINOR = 1;
+ public final byte pv[][] = {
+ // !VER1!
+ };
+}
Propchange: incubator/qpid/branches/new_persistence/java/common/src/main/versions/ProtocolVersionList.java
------------------------------------------------------------------------------
svn:eol-style = native